From 71e616f64d511756f47303eb465cadfb98141573 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Wed, 12 Nov 2025 00:30:41 +0100 Subject: [PATCH] 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; + }; }; }; };