home/programs/waybar/default.nix

@@ -1,19 +1,17 @@
 {
+  osConfig,
   pkgs,
   lib,
-  osConfig,
-  config,
   ...
 }: let
-  inherit (lib) getExe mkMerge mkIf;
+  inherit (lib) getExe;
 in {
   imports = [./style.nix];
   programs.waybar = {
     enable = true;
     systemd.enable = true;
     settings = {
-      mainBar = mkMerge [
+      mainBar = {
-        {
         layer = "top";
         position = "top";
         height = 30;
@@ -25,9 +23,7 @@ in {
 
         modules-left = ["niri/workspaces" "niri/window"];
         modules-center = ["group/clock"];
-          modules-right =
+        modules-right = ["tray" "group/status" "group/power"];
-            ["tray" "group/status" "group/power"]
-            ++ lib.optional config.services.swaync.enable "custom/notification";
 
         battery = {
           interval = 10;
@@ -48,6 +44,10 @@ in {
           max-length = 25;
         };
 
+        "niri/window" = {
+          icon = true;
+        };
+
         "pulseaudio" = {
           format = "{icon} {volume}%";
           format-bluetooth = "{icon} {volume}%";
@@ -146,28 +146,7 @@ in {
             "󰤨"
           ];
         };
-        }
-        (mkIf osConfig.programs.niri.enable {
-          "niri/window" = {
-            icon = true;
       };
-        })
-        (mkIf config.services.swaync.enable {
-          "custom/notification" = {
-            tooltip = false;
-            format = "{icon}";
-            format-icons = {
-              notification = "󱅫";
-              none = "󰂚";
-              dnd-notification = "󱏧";
-              dnd-none = "󱏧";
-            };
-            return-type = "json";
-            exec = "swaync-client -swb";
-            on-click = "swaync-client -t -sw";
-          };
-        })
-      ];
     };
   };
 

home/programs/waybar/style.nix

@@ -88,8 +88,7 @@ in {
       #network,
       #pulseaudio,
       #tray,
-      #power-profiles-daemon
+      #power-profiles-daemon {
-      {
         padding: 0 0.5em;
       }
 
@@ -103,9 +102,5 @@ in {
         padding: 0 1.2em;
         color: @base08;
       }
-
-      #custom-notification {
-        padding: 0 1.2em;
-      }
     '';
 }

home/services/swaync.nix

@@ -1,7 +0,0 @@
-{lib, ...}: {
-  services.swaync = {
-    enable = true;
-  };
-  # systemd.user.services.swaync.Service.Environment = "WAYLAND_DISPLAY=wayland-1";
-  systemd.user.services.swaync.Unit.ConditionEnvironment = lib.mkForce "";
-}

hosts/vamos/default.nix

@@ -35,7 +35,6 @@ in {
 
       "${home}/programs/niri"
       "${home}/programs/waybar"
-      "${home}/services/swaync.nix"
       "${home}/programs/fuzzel.nix"
       "${home}/programs/swaybg.nix"
       "${home}/programs/swaylock.nix"