changed a bunch of things

updated the Wallpaper Menu and adjusted other things

8 files changed, 169 insertions, 164 deletions

diff --git a/fastfetch/config.jsonc b/fastfetch/config.jsonc
index 22beca8..44efac7 100644
--- a/fastfetch/config.jsonc
+++ b/fastfetch/config.jsonc
@@ -20,10 +20,11 @@
         "separator": " "
     },
     "modules": [
-			{
-					"type": "title",
-					"keyWidth": 10
-			},
+			"break",
+			// {
+					// "type": "title",
+					// "keyWidth": 10
+			// },
 			{
 					"type": "os",
 					"key": " ",
diff --git a/nvim/lua/plugins/lspsaga.lua b/nvim/lua/plugins/lspsaga.lua
index b87260a..48ac080 100644
--- a/nvim/lua/plugins/lspsaga.lua
+++ b/nvim/lua/plugins/lspsaga.lua
@@ -1,38 +1,35 @@
 local config = function()
-  vim.diagnostic.config({
-    severity_sort = true,
-  })
-  require("lspsaga").setup({
-    ui = {
-      code_action = "",
-    },
-    outline = {
-      keys = {
-        toggle_or_jump = "<Enter>"
-      }
-    },
-    finder = {
-      keys = {
-        toggle_or_open = "<Enter>",
-        shuttle = "<Tab>",
-      }
-    },
-    diagnostic = {
-      diagnostic_only_current = true,
-    }
-  })
-  vim.diagnostic.config({
-    virtual_text = false
-  })
+	vim.diagnostic.config({
+		severity_sort = true,
+	})
+	require("lspsaga").setup({
+		ui = {
+			code_action = "",
+		},
+		outline = {
+			keys = {
+				toggle_or_jump = "<Enter>"
+			}
+		},
+		finder = {
+			keys = {
+				toggle_or_open = "<Enter>",
+				shuttle = "<Tab>",
+			}
+		},
+	})
+	vim.diagnostic.config({
+		virtual_text = true
+	})
 end
 
 return {
-  "nvimdev/lspsaga.nvim",
-  lazy = true,
-  event = { "BufReadPost", "BufWritePost", "BufNewFile" },
-  config = config,
-  dependencies = {
-    "nvim-treesitter/nvim-treesitter", -- optional
-    "nvim-tree/nvim-web-devicons",     -- optional
-  },
+	"nvimdev/lspsaga.nvim",
+	lazy = true,
+	event = { "BufReadPost", "BufWritePost", "BufNewFile" },
+	config = config,
+	dependencies = {
+		"nvim-treesitter/nvim-treesitter", -- optional
+		"nvim-tree/nvim-web-devicons",   -- optional
+	},
 }
diff --git a/nvim/lua/plugins/nvim-lspconfig.lua b/nvim/lua/plugins/nvim-lspconfig.lua
index 639734e..713a87b 100644
--- a/nvim/lua/plugins/nvim-lspconfig.lua
+++ b/nvim/lua/plugins/nvim-lspconfig.lua
@@ -1,122 +1,122 @@
 local config = function()
-  local lsp = vim.lsp
-  local capabilities = require("cmp_nvim_lsp").default_capabilities()
+	local lsp = vim.lsp
+	local capabilities = require("cmp_nvim_lsp").default_capabilities()
 
-  -- setting custom signs
-  local signs = { Error = "", Warn = "", Hint = "", Info = "" }
-  for type, icon in pairs(signs) do
-    local hl = "DiagnosticSign" .. type
-    vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
-  end
+	-- setting custom signs
+	local signs = { Error = "", Warn = "", Hint = "", Info = "" }
+	for type, icon in pairs(signs) do
+		local hl = "DiagnosticSign" .. type
+		vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
+	end
 
-  vim.api.nvim_create_autocmd('LspAttach', {
-    callback = function(ev)
-      local client = lsp.get_client_by_id(ev.data.client_id)
-      local keymap = vim.keymap
-      local opts = { noremap = true, silent = true, buffer = ev.buf, desc = "" }
+	vim.api.nvim_create_autocmd('LspAttach', {
+		callback = function(ev)
+			local client = lsp.get_client_by_id(ev.data.client_id)
+			local keymap = vim.keymap
+			local opts = { noremap = true, silent = true, buffer = ev.buf, desc = "" }
 
-      -- setting custom keymaps
-      opts.desc = "Finder"
-      keymap.set("n", "<Space>lf", ":Lspsaga finder<Enter>", opts)                     -- go to definition
-      opts.desc = "Peek Definition (Lspsaga)"
-      keymap.set("n", "<Space>lp", ":Lspsaga peek_definition<Enter>", opts)            -- peak definition
-      opts.desc = "Goto Definition (Lspsaga)"
-      keymap.set("n", "<Space>lg", ":Lspsaga goto_definition<Enter>", opts)            -- go to definition
-      opts.desc = "Code Action (Lspsaga)"
-      keymap.set("n", "<Space>la", ":Lspsaga code_action<Enter>", opts)                -- see available code actions
-      opts.desc = "Rename (Lspsaga)"
-      keymap.set("n", "<Space>lr", ":Lspsaga rename<Enter>", opts)                     -- smart rename
-      opts.desc = "Hover Documentation (Lspsaga)"
-      keymap.set("n", "<Space>lk", lsp.buf.hover, opts)                                -- show documentation for what is under cursor
-      opts.desc = "Outline (Lspsaga)"
-      keymap.set("n", "<Space>lo", ":Lspsaga outline<Enter>", opts)                    -- show outline
-      opts.desc = "Diagnostic (Lspsaga)"
-      keymap.set("n", "<Space>ld", ":Lspsaga show_workspace_diagnostics<Enter>", opts) -- show diagnostics
+			-- setting custom keymaps
+			opts.desc = "Finder"
+			keymap.set("n", "<Space>lf", ":Lspsaga finder<Enter>", opts)                  -- go to definition
+			opts.desc = "Peek Definition (Lspsaga)"
+			keymap.set("n", "<Space>lp", ":Lspsaga peek_definition<Enter>", opts)         -- peak definition
+			opts.desc = "Goto Definition (Lspsaga)"
+			keymap.set("n", "<Space>lg", ":Lspsaga goto_definition<Enter>", opts)         -- go to definition
+			opts.desc = "Code Action (Lspsaga)"
+			keymap.set("n", "<Space>la", ":Lspsaga code_action<Enter>", opts)             -- see available code actions
+			opts.desc = "Rename (Lspsaga)"
+			keymap.set("n", "<Space>lr", ":Lspsaga rename<Enter>", opts)                  -- smart rename
+			opts.desc = "Hover Documentation (Lspsaga)"
+			keymap.set("n", "<Space>lk", lsp.buf.hover, opts)                             -- show documentation for what is under cursor
+			opts.desc = "Outline (Lspsaga)"
+			keymap.set("n", "<Space>lo", ":Lspsaga outline<Enter>", opts)                 -- show outline
+			opts.desc = "Diagnostic (Lspsaga)"
+			keymap.set("n", "<Space>ld", ":Lspsaga show_workspace_diagnostics<Enter>", opts) -- show diagnostics
 
-      -- enable auto formatting on save
-      if client ~= nil and client:supports_method("textDocument/formatting") then
-        vim.api.nvim_create_autocmd("BufWritePre", {
-          buffer = ev.buf,
-          callback = function()
-            lsp.buf.format({ async = true })
-          end,
-        })
-      end
-    end
-  })
+			-- enable auto formatting on save
+			if client ~= nil and client:supports_method("textDocument/formatting") then
+				vim.api.nvim_create_autocmd("BufWritePre", {
+					buffer = ev.buf,
+					callback = function()
+						lsp.buf.format({ async = true })
+					end,
+				})
+			end
+		end
+	})
 
-  vim.api.nvim_create_autocmd('LspDetach', {
-    callback = function(ev)
-      local client = lsp.get_client_by_id(ev.data.client_id)
-      local keymap = vim.keymap
-      keymap.del("n", "<Space>lf")
-      keymap.del("n", "<Space>lp")
-      keymap.del("n", "<Space>lg")
-      keymap.del("n", "<Space>la")
-      keymap.del("n", "<Space>lr")
-      keymap.del("n", "<Space>lk")
-      keymap.del("n", "<Space>lo")
-      keymap.del("n", "<Space>ld")
-      if client ~= nil and client:supports_method('textDocument/formatting') then
-        vim.api.nvim_clear_autocmds({
-          event = 'BufWritePre',
-          buffer = ev.buf,
-        })
-      end
-    end,
-  })
+	vim.api.nvim_create_autocmd('LspDetach', {
+		callback = function(ev)
+			local client = lsp.get_client_by_id(ev.data.client_id)
+			local keymap = vim.keymap
+			keymap.del("n", "<Space>lf")
+			keymap.del("n", "<Space>lp")
+			keymap.del("n", "<Space>lg")
+			keymap.del("n", "<Space>la")
+			keymap.del("n", "<Space>lr")
+			keymap.del("n", "<Space>lk")
+			keymap.del("n", "<Space>lo")
+			keymap.del("n", "<Space>ld")
+			if client ~= nil and client:supports_method('textDocument/formatting') then
+				vim.api.nvim_clear_autocmds({
+					event = 'BufWritePre',
+					buffer = ev.buf,
+				})
+			end
+		end,
+	})
 
-  -- C/C++
-  lsp.enable("clangd")
-  lsp.config("clangd", {
-    capabilities = capabilities,
-  })
-  -- Rust
-  lsp.enable("rust_analyzer")
-  lsp.config("rust_analyzer", {
-    capabilities = capabilities,
-  })
-  -- Haskell
-  lsp.enable("hls")
-  lsp.config("hls", {
-    capabilities = capabilities,
-    settings = {
-      ['haskell'] = {
-        cabalFormattingProvider = "cabal-fmt",
-        formattingProvider = "ormolu"
-      },
-    },
-  })
-  -- Lua
-  lsp.enable("lua_ls")
-  lsp.config("lua_ls", {
-    capabilities = capabilities,
-  })
-  -- JavaScript/Typescript
-  lsp.enable("ts_ls")
-  lsp.config("ts_ls", {
-    capabilities = capabilities,
-  })
-  -- CSS
-  lsp.enable("cssls")
-  lsp.config("cssls", {
-    capabilities = capabilities,
-  })
-  -- Meson
-  lsp.enable("mesonlsp")
-  lsp.config("mesonlsp", {
-    capabilities = capabilities,
-  })
-  -- Zig
-  lsp.enable("zls")
-  lsp.config("zls", {
-    capabilities = capabilities,
-  })
+	-- C/C++
+	lsp.enable("clangd")
+	lsp.config("clangd", {
+		capabilities = capabilities,
+	})
+	-- Rust
+	lsp.enable("rust_analyzer")
+	lsp.config("rust_analyzer", {
+		capabilities = capabilities,
+	})
+	-- Haskell
+	lsp.enable("hls")
+	lsp.config("hls", {
+		capabilities = capabilities,
+		settings = {
+			['haskell'] = {
+				cabalFormattingProvider = "cabalfmt",
+				formattingProvider = "ormolu"
+			},
+		},
+	})
+	-- Lua
+	lsp.enable("lua_ls")
+	lsp.config("lua_ls", {
+		capabilities = capabilities,
+	})
+	-- JavaScript/Typescript
+	lsp.enable("ts_ls")
+	lsp.config("ts_ls", {
+		capabilities = capabilities,
+	})
+	-- CSS
+	lsp.enable("cssls")
+	lsp.config("cssls", {
+		capabilities = capabilities,
+	})
+	-- Meson
+	lsp.enable("mesonlsp")
+	lsp.config("mesonlsp", {
+		capabilities = capabilities,
+	})
+	-- Zig
+	lsp.enable("zls")
+	lsp.config("zls", {
+		capabilities = capabilities,
+	})
 end
 
 return {
-  "neovim/nvim-lspconfig",
-  config = config,
-  lazy = true,
-  event = { "BufReadPost", "BufWritePost", "BufNewFile" }
+	"neovim/nvim-lspconfig",
+	config = config,
+	lazy = true,
+	event = { "BufReadPost", "BufWritePost", "BufNewFile" }
 }
diff --git a/scripts/wallpapermenu b/scripts/wallpapermenu
index 789dd1c..c90ff7c 100755
--- a/scripts/wallpapermenu
+++ b/scripts/wallpapermenu
@@ -6,6 +6,6 @@ set chosen (
     if test -z $img; or test $file != $img
       echo -en "$file\0icon\x1fthumbnail://$file\n"
     end
-  end | rofi -dmenu -show-icons -theme ~/.config/rofi/wallpapermenu.rasi)
+  end | rofi -dmenu -p " " -show-icons -theme ~/.config/rofi/wallpapermenu.rasi)
 
 ~/.config/scripts/set_background (echo $chosen)
diff --git a/swayidle/config b/swayidle/config
index bd1d8a0..db6bd60 100644
--- a/swayidle/config
+++ b/swayidle/config
@@ -1,4 +1,4 @@
-lock 'swaylock -fe'
+lock 'physlock -l ; swaylock -fe ; physlock -L'
 before-sleep 'loginctl lock-session ; niri msg eDP-1 off'
 after-resume 'niri msg eDP-1 on'
 timeout 300 'brightnessctl -se set 10%' resume 'brightnessctl -r'
diff --git a/wallust/templates/niri b/wallust/templates/niri
index 45e952d..bcd5d1a 100644
--- a/wallust/templates/niri
+++ b/wallust/templates/niri
@@ -101,7 +101,12 @@ layout {
     gaps-between-tabs 5
     active-color "{{color1}}"
     inactive-color "{{color0}}"
+		length total-proportion=1.0
   }
+
+	insert-hint {
+		color "{{color1}}"
+	}
 }
 
 overview {
@@ -143,7 +148,7 @@ binds {
   Mod+Space          hotkey-overlay-title="Spawn Applauncher"   { spawn "rofi" "-show" "drun" "-theme" "~/.config/rofi/applauncher.rasi"; }
   Mod+Escape         hotkey-overlay-title="Spawn Powermenu"     { spawn "~/.config/scripts/powermenu"; }
   Mod+W              hotkey-overlay-title="Spawn Wallpapermenu" { spawn "~/.config/scripts/wallpapermenu"; }
-  // Mod+W repeat=false hotkey-overlay-title="Random Wallpaper"  { spawn "~/.config/scripts/set_random" "/home/eric.marin/Pictures/Backgrounds/"; }
+  Mod+Shift+W repeat=false hotkey-overlay-title="Random Wallpaper"  { spawn "~/.config/scripts/set_random" "/home/eric.marin/Pictures/Backgrounds/"; }
 
   XF86AudioRaiseVolume  allow-when-locked=true { spawn "pamixer" "-i" "5"; }
   XF86AudioLowerVolume  allow-when-locked=true { spawn "pamixer" "-d" "5"; }
diff --git a/wallust/templates/rofi-applauncher b/wallust/templates/rofi-applauncher
index a1ab13d..b81a204 100644
--- a/wallust/templates/rofi-applauncher
+++ b/wallust/templates/rofi-applauncher
@@ -9,14 +9,15 @@ configuration {
 * {
 	background-color: {{background}};
 	color: {{foreground}};
+	font: "Hack Nerd Font 10";
 }
 window {
 	location: north west;
 	anchor: center;
-	width: 580;
+	width: 598;
 	y-offset: -22;
-	x-offset: 260;
-	padding: 3 5 3 5;
+	x-offset: 251;
+	padding: 3 5 3 3;
 }
 mainbox {
 	orientation: horizontal;
@@ -32,7 +33,6 @@ listview {
 	layout: horizontal;
 }
 element-text {
-	font: "Hack Nerd Font 10";
 	color: inherit;
 }
 element selected {
diff --git a/wallust/templates/rofi-wallpapermenu b/wallust/templates/rofi-wallpapermenu
index 9a8e8b4..fe4fe13 100644
--- a/wallust/templates/rofi-wallpapermenu
+++ b/wallust/templates/rofi-wallpapermenu
@@ -2,20 +2,22 @@
 
 * {
 	background-color: {{background}};
+	color: {{foreground}};
+	font: "Hack Nerd Font 10";
 }
 window {
-	children: [ horibox ];
 	border: 1;
 	border-color: {{color1}};
 	padding: 5;
 	width: 1197;
 }
-horibox {
-	orientation: horizontal;
-	children: [ entry, listview ];
+mainbox {
+	spacing: 5;
 }
-entry {
-	enabled: false;
+inputbar {
+	border: 1;
+	border-color: {{color1}};
+	padding: 5;
 }
 listview {
 	spacing: 5;
@@ -23,17 +25,17 @@ listview {
 	lines: 3;
 	fixed-columns: true;
 	fixed-height: true;
-	children: [element-icon];
+	cycle: true;
 }
 element {
 	border-color: {{color0}};
 	border: 1;
-	children: [element-icon];
+	children: [ element-icon ];
 }
 element-icon {
 	expand: true;
 	size: 50%;
-	margin: -85 0;
+	margin: -100 0;
 	squared: true;
 }
 element selected{