update

9 files changed, 113 insertions, 104 deletions

diff --git a/nvim/lua/plugins/lspsaga.lua b/nvim/lua/plugins/lspsaga.lua
index 48ac080..86e949f 100644
--- a/nvim/lua/plugins/lspsaga.lua
+++ b/nvim/lua/plugins/lspsaga.lua
@@ -1,6 +1,8 @@
 local config = function()
 	vim.diagnostic.config({
 		severity_sort = true,
+		virtual_lines = true,
+		virtual_text = false
 	})
 	require("lspsaga").setup({
 		ui = {
@@ -18,9 +20,6 @@ local config = function()
 			}
 		},
 	})
-	vim.diagnostic.config({
-		virtual_text = true
-	})
 end
 
 return {
diff --git a/nvim/lua/plugins/neopywal.lua b/nvim/lua/plugins/neopywal.lua
index 31a9b47..7c37dbe 100644
--- a/nvim/lua/plugins/neopywal.lua
+++ b/nvim/lua/plugins/neopywal.lua
@@ -1,19 +1,26 @@
 local init = function()
-  vim.cmd.colorscheme("neopywal")
+	vim.cmd.colorscheme("neopywal")
 end
 
-local opts = {
-  use_wallust = true,
-  plugins = {
-    treesitter = true
-  }
-}
+local config = function()
+	require("neopywal").setup({
+		plugins = {
+			treesitter = true
+		},
+		custom_colors = {},
+		custom_highlights = {},
+		use_palette = {
+			light = "wallust",
+			dark = "wallust",
+		},
+	})
+end
 
 return {
-  "RedsXDD/neopywal.nvim",
-  lazy = false,
-  name = "neopywal",
-  init = init,
-  opts = opts,
-  priority = 1000,
+	"RedsXDD/neopywal.nvim",
+	lazy = false,
+	name = "neopywal",
+	init = init,
+	config = config,
+	priority = 1000,
 }
diff --git a/nvim/lua/plugins/oil.lua b/nvim/lua/plugins/oil.lua
index c19baad..0d90db2 100644
--- a/nvim/lua/plugins/oil.lua
+++ b/nvim/lua/plugins/oil.lua
@@ -1,48 +1,63 @@
 local init = function()
-  local keymap = vim.keymap
-  keymap.set("n", "<Space>b", ":Oil --float .<Enter>",
-    { noremap = true, silent = true, desc = "File browser (Oil)" }) -- Oil
+	local keymap = vim.keymap
+	keymap.set("n", "<Space>b", ":Oil --float .<Enter>",
+		{ noremap = true, silent = true, desc = "File browser (Oil)" }) -- Oil
 end
 
 local config = function()
-  local detail = false
-  require("oil").setup({
-    default_file_explorer = true,
-    delete_to_trash = true,
-    skip_confirm_for_simple_edits = true,
-    keymaps = {
-      ["b?"] = "actions.show_help",
-      ["<CR>"] = "actions.select",
-      ["bp"] = "actions.preview",
-      ["q"] = "actions.close",
-      ["br"] = "actions.refresh",
-      ["-"] = "actions.parent",
-      ["_"] = "actions.open_cwd",
-      ["~"] = "actions.cd",
-      ["bs"] = "actions.change_sort",
-      ["b."] = "actions.toggle_hidden",
-      ["bt"] = "actions.toggle_trash",
-      ["bd"] = {
-        desc = "Toggle file detail view",
-        callback = function()
-          detail = not detail
-          if detail then
-            require("oil").set_columns({ "icon", "permissions", "size", "mtime" })
-          else
-            require("oil").set_columns({ "icon" })
-          end
-        end,
-      },
-    },
-    use_default_keymaps = false,
-  })
+	local detail = false
+	require("oil").setup({
+		float = {
+			border = "rounded",
+		},
+		confirmation = {
+			border = "rounded",
+		},
+		progress = {
+			border = "rounded",
+		},
+		ssh = {
+			border = "rounded",
+		},
+		keymaps_help = {
+			border = "rounded",
+		},
+		default_file_explorer = true,
+		delete_to_trash = true,
+		skip_confirm_for_simple_edits = true,
+		keymaps = {
+			["b?"] = "actions.show_help",
+			["<CR>"] = "actions.select",
+			["bp"] = "actions.preview",
+			["q"] = "actions.close",
+			["br"] = "actions.refresh",
+			["-"] = "actions.parent",
+			["_"] = "actions.open_cwd",
+			["~"] = "actions.cd",
+			["bs"] = "actions.change_sort",
+			["b."] = "actions.toggle_hidden",
+			["bt"] = "actions.toggle_trash",
+			["bd"] = {
+				desc = "Toggle file detail view",
+				callback = function()
+					detail = not detail
+					if detail then
+						require("oil").set_columns({ "icon", "permissions", "size", "mtime" })
+					else
+						require("oil").set_columns({ "icon" })
+					end
+				end,
+			},
+		},
+		use_default_keymaps = false,
+	})
 end
 
 return {
-  "stevearc/oil.nvim",
-  dependencies = { "nvim-tree/nvim-web-devicons" },
-  lazy = true,
-  cmd = "Oil",
-  init = init,
-  config = config
+	"stevearc/oil.nvim",
+	dependencies = { "nvim-tree/nvim-web-devicons" },
+	lazy = true,
+	cmd = "Oil",
+	init = init,
+	config = config
 }
diff --git a/swayidle/config b/swayidle/config
index db6bd60..1157d55 100644
--- a/swayidle/config
+++ b/swayidle/config
@@ -1,5 +1,5 @@
 lock 'physlock -l ; swaylock -fe ; physlock -L'
-before-sleep 'loginctl lock-session ; niri msg eDP-1 off'
-after-resume 'niri msg eDP-1 on'
+before-sleep 'loginctl lock-session ; niri msg output eDP-1 off'
+after-resume 'niri msg output eDP-1 on'
 timeout 300 'brightnessctl -se set 10%' resume 'brightnessctl -r'
 timeout 360 'systemctl suspend'
diff --git a/wallust/templates/niri b/wallust/templates/niri
index bcd5d1a..3f454cb 100644
--- a/wallust/templates/niri
+++ b/wallust/templates/niri
@@ -136,6 +136,12 @@ window-rule {
 window-rule {
   match app-id="SFML"
 }
+window-rule {
+	match is-floating=true
+	shadow {
+		on
+	}
+}
 
 switch-events {
   lid-open { spawn "niri" "msg" "action" "power-on-monitors"; }
@@ -148,12 +154,11 @@ 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+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"; }
   XF86AudioMute         allow-when-locked=true { spawn "pamixer" "-t"; }
-  XF86AudioMicMute      allow-when-locked=true { spawn "pamixer" "--default-source" "-m"; }
+  XF86AudioMicMute      allow-when-locked=true { spawn "pamixer" "--default-source" "-t"; }
   XF86MonBrightnessUp   allow-when-locked=true { spawn "brightnessctl" "-e" "s" "+5%"; }
   XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "-e" "s" "5%-"; }
 
diff --git a/wallust/templates/rofi-applauncher b/wallust/templates/rofi-applauncher
index b81a204..f27e4b4 100644
--- a/wallust/templates/rofi-applauncher
+++ b/wallust/templates/rofi-applauncher
@@ -14,9 +14,9 @@ configuration {
 window {
 	location: north west;
 	anchor: center;
-	width: 598;
+	width: 589;
 	y-offset: -22;
-	x-offset: 251;
+	x-offset: 260;
 	padding: 3 5 3 3;
 }
 mainbox {
diff --git a/wallust/templates/rofi-powermenu b/wallust/templates/rofi-powermenu
index a09948b..0ce26aa 100644
--- a/wallust/templates/rofi-powermenu
+++ b/wallust/templates/rofi-powermenu
@@ -7,18 +7,19 @@ configuration {
 	background-color: {{background}};
 }
 window {
-	children: [ horibox ];
+	location: north east;
+	children: [ box ];
 	border: 1;
 	border-color: {{color1}};
 	padding: 5;
-	width: 416px;
+	width: 60px;
 }
-horibox {
-	orientation: horizontal;
+box {
+	orientation: vertical;
 	children: [ listview ];
 }
 listview {
-	layout: horizontal;
+	layout: vertical;
 	spacing: 5;
 	lines: 6;
 }
@@ -28,7 +29,7 @@ element {
 	padding: 15;
 }
 element-text {
-	font: "Symbols Nerd Font Mono 25";
+	font: "Symbols Nerd Font Mono 13";
 	text-color: inherit;
 	background-color: inherit;
 	vertical-align: 0.5;
diff --git a/wallust/wallust.toml b/wallust/wallust.toml
index 8b80868..6214911 100644
--- a/wallust/wallust.toml
+++ b/wallust/wallust.toml
@@ -1,39 +1,16 @@
 backend = "fastresize"
 check_contrast = true
-color_space = "lch"
+color_space = "lab"
 fallback_generator = "complementary"
 palette = "ansidark16"
 
 [templates]
-foot.template = "foot"
-foot.target = "~/.config/foot/foot.ini"
-
-nvim.template = "nvim"
-nvim.target = "~/.cache/wal/colors-wal.vim"
-
-# fuzzel.template = "fuzzel"
-# fuzzel.target = "~/.config/fuzzel/fuzzel.ini"
-
-niri.template = "niri"
-niri.target = "~/.config/niri/config.kdl"
-
-# hyprlock.template = "hyprlock"
-# hyprlock.target = "~/.config/hypr/hyprlock.conf"
-
-swaylock.template = "swaylock"
-swaylock.target = "~/.config/swaylock/config"
-
-mako.template = "mako"
-mako.target = "~/.config/mako/config"
-
-waybar.template = "waybar"
-waybar.target = "~/.config/waybar/style.css"
-
-rofi-applauncher.template = "rofi-applauncher"
-rofi-applauncher.target = "~/.config/rofi/applauncher.rasi"
-
-rofi-powermenu.template = "rofi-powermenu"
-rofi-powermenu.target = "~/.config/rofi/powermenu.rasi"
-
-rofi-wallpapermenu.template = "rofi-wallpapermenu"
-rofi-wallpapermenu.target = "~/.config/rofi/wallpapermenu.rasi"
+foot =								{ src = "foot",								dst = "~/.config/foot/foot.ini" }
+nvim =								{ src = "nvim",								dst = "~/.cache/wallust/colors_neopywal.vim" }
+niri =								{ src = "niri",								dst = "~/.config/niri/config.kdl" }
+swaylock =						{ src = "swaylock",						dst = "~/.config/swaylock/config" }
+mako =								{ src = "mako",								dst = "~/.config/mako/config" }
+waybar =							{ src = "waybar",							dst = "~/.config/waybar/style.css" }
+rofi-applauncher =		{ src = "rofi-applauncher",		dst = "~/.config/rofi/applauncher.rasi" }
+rofi-powermenu =			{ src = "rofi-powermenu",			dst = "~/.config/rofi/powermenu.rasi" }
+rofi-wallpapermenu =	{ src = "rofi-wallpapermenu",	dst = "~/.config/rofi/wallpapermenu.rasi" }
diff --git a/waybar/config b/waybar/config
index 4ab1dba..a4b1dfc 100644
--- a/waybar/config
+++ b/waybar/config
@@ -81,12 +81,17 @@
         "tooltip-format": "{used} / {total}"
     },
     "battery": {
-	"interval": 5,
+				"interval": 5,
         "states": {
             "warning": 25,
+						"notfull": 99,
         },
-        "format": "<span font-family='Symbols Nerd Font Mono'>{icon}</span> {capacity}%",
-	"format-charging": "<span font-family='Symbols Nerd Font Mono'>󰂄</span>{capacity}%",
+				"format": "<span font-family='Symbols Nerd Font Mono'>{icon}</span>{capacity}%",
+        "format-notfull": "<span font-family='Symbols Nerd Font Mono'>{icon}</span> {capacity}%",
+        "format-warning": "<span font-family='Symbols Nerd Font Mono'>{icon}</span> {capacity}%",
+				"format-charging": "<span font-family='Symbols Nerd Font Mono'>󰂄</span>{capacity}%",
+				"format-charging-notfull": "<span font-family='Symbols Nerd Font Mono'>󰂄</span> {capacity}%",
+				"format-charging-warning": "<span font-family='Symbols Nerd Font Mono'>󰂄</span> {capacity}%",
         "format-icons": ["󰂎","󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"],
     },
     "clock": {