From c0b36e1e1f6a706c6af7c2dacd50456986a6d357 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Tue, 11 Nov 2025 17:14:37 +0100 Subject: [PATCH 1/4] add trayscale --- homeConfigurations/vinzenz/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/homeConfigurations/vinzenz/default.nix b/homeConfigurations/vinzenz/default.nix index 4a2ff59..34ea693 100644 --- a/homeConfigurations/vinzenz/default.nix +++ b/homeConfigurations/vinzenz/default.nix @@ -88,5 +88,7 @@ }; "idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.fsnotifier}/bin/fsnotifier"; }; + + services.trayscale.enable = true; }; } From e8f183276d9a1e30067b71eaaaf66c3cc1de1415 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Tue, 11 Nov 2025 17:24:45 +0100 Subject: [PATCH 2/4] mako: border radius and timeout --- homeConfigurations/vinzenz/mako.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/homeConfigurations/vinzenz/mako.nix b/homeConfigurations/vinzenz/mako.nix index b8052a4..c4bbcac 100644 --- a/homeConfigurations/vinzenz/mako.nix +++ b/homeConfigurations/vinzenz/mako.nix @@ -1,3 +1,9 @@ { - services.mako.enable = true; + services.mako = { + enable = true; + settings = { + border-radius = 15; + default-timeout = 30 * 1000; + }; + }; } From 71e616f64d511756f47303eb465cadfb98141573 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Wed, 12 Nov 2025 00:30:41 +0100 Subject: [PATCH 3/4] swap mako with swaync --- homeConfigurations/vinzenz/default.nix | 2 +- homeConfigurations/vinzenz/mako.nix | 9 ------ homeConfigurations/vinzenz/swaync.nix | 6 ++++ homeConfigurations/vinzenz/waybar.nix | 43 +++++++++++++++++++++++--- 4 files changed, 45 insertions(+), 15 deletions(-) delete mode 100644 homeConfigurations/vinzenz/mako.nix create mode 100644 homeConfigurations/vinzenz/swaync.nix diff --git a/homeConfigurations/vinzenz/default.nix b/homeConfigurations/vinzenz/default.nix index 34ea693..cdc5fde 100644 --- a/homeConfigurations/vinzenz/default.nix +++ b/homeConfigurations/vinzenz/default.nix @@ -7,11 +7,11 @@ ./fuzzel.nix ./git.nix ./gnome.nix - ./mako.nix ./niri.nix ./ssh.nix ./starship.nix ./swaylock.nix + ./swaync.nix ./vscode.nix ./waybar.nix ./zsh.nix diff --git a/homeConfigurations/vinzenz/mako.nix b/homeConfigurations/vinzenz/mako.nix deleted file mode 100644 index c4bbcac..0000000 --- a/homeConfigurations/vinzenz/mako.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - services.mako = { - enable = true; - settings = { - border-radius = 15; - default-timeout = 30 * 1000; - }; - }; -} diff --git a/homeConfigurations/vinzenz/swaync.nix b/homeConfigurations/vinzenz/swaync.nix new file mode 100644 index 0000000..8221c5e --- /dev/null +++ b/homeConfigurations/vinzenz/swaync.nix @@ -0,0 +1,6 @@ +{ + services.swaync = { + enable = true; + settings = { }; + }; +} diff --git a/homeConfigurations/vinzenz/waybar.nix b/homeConfigurations/vinzenz/waybar.nix index 44d7099..f117cb7 100644 --- a/homeConfigurations/vinzenz/waybar.nix +++ b/homeConfigurations/vinzenz/waybar.nix @@ -38,19 +38,29 @@ #"image" "gamemode" - "temperature" - "cpu" - "memory" - "disk" + "group/status-infos" + "wireplumber" "bluetooth" "backlight" "network" "power-profiles-daemon" - "battery" + "custom/swaync" "idle_inhibitor" "group/group-power" + ]; + + "group/status-infos" = { + orientation = "inherit"; + modules = [ + "battery" + "temperature" + "cpu" + "memory" + "disk" + ]; + }; "niri/workspaces" = { format = "{icon}"; }; @@ -225,6 +235,29 @@ tooltip-format-enumerate-connected = "{device_alias}\t{device_address}"; tooltip-format-enumerate-connected-battery = "{device_alias}\t{device_address}\t{device_battery_percentage}%"; }; + "custom/swaync" = + let + swaync-client = "${lib.getBin config.services.swaync.package}/bin/swaync-client"; + in + { + tooltip = true; + format = "{0}{icon} "; + format-icons = { + notification = "󱅫"; + none = "󰂜"; + dnd-notification = "󰂠"; + dnd-none = "󰪓"; + inhibited-notification = "󰂛"; + inhibited-none = "󰪑"; + dnd-inhibited-notification = "󰂛"; + dnd-inhibited-none = "󰪑"; + }; + return-type = "json"; + exec = "${swaync-client} --subscribe-waybar"; + on-click = "${swaync-client} --toggle-panel --skip-wait"; + on-click-right = "${swaync-client} --toggle-dnd --skip-wait"; + escape = true; + }; }; }; }; From 88e15931b0204d2e4b2e416137a0375a1752f932 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Wed, 12 Nov 2025 00:58:10 +0100 Subject: [PATCH 4/4] waybar: group items --- homeConfigurations/vinzenz/waybar.nix | 30 ++++++++++++++------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/homeConfigurations/vinzenz/waybar.nix b/homeConfigurations/vinzenz/waybar.nix index f117cb7..4de0a61 100644 --- a/homeConfigurations/vinzenz/waybar.nix +++ b/homeConfigurations/vinzenz/waybar.nix @@ -26,7 +26,6 @@ spacing = "8"; modules-left = [ "niri/workspaces" - "tray" "niri/window" ]; modules-center = [ @@ -34,23 +33,26 @@ "clock" ]; modules-right = [ - "mpris" #"image" - "gamemode" - "group/status-infos" - - "wireplumber" - "bluetooth" - "backlight" - "network" - "power-profiles-daemon" - "custom/swaync" - "idle_inhibitor" + "tray" + "group/system-tray" "group/group-power" - ]; + "group/system-tray" = { + orientation = "inherit"; + modules = [ + "mpris" + "wireplumber" + "bluetooth" + "backlight" + "network" + "power-profiles-daemon" + "custom/swaync" + "idle_inhibitor" + ]; + }; "group/status-infos" = { orientation = "inherit"; modules = [ @@ -61,10 +63,10 @@ "disk" ]; }; + "niri/workspaces" = { format = "{icon}"; }; - "niri/window" = { separate-outputs = true; icon = true;