1 files changed, 17 insertions, 25 deletions

diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix
index 33bf7ef2..34f52172 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -126,15 +126,6 @@ in {
         After = ["graphical-session-pre.target"];
       };
     };
-    dunst = {
-      Service = {
-        ExecStart = lib.mkForce "${cfg.services.dunst.package}/bin/dunst";
-        Restart = "always";
-      };
-      Install = {
-        WantedBy = ["graphical-session.target"];
-      };
-    };
     keepassxc = {
       Service = {
         Type = "dbus";
@@ -204,20 +195,6 @@ in {
         WatchdogSec = "2s";
       };
     };
-    polkit-gnome-authentication-agent-1 = {
-      Install = {
-        WantedBy = ["graphical-session.target"];
-      };
-      Unit = {
-        PartOf = ["graphical-session.target"];
-        Requires = ["graphical-session-pre.target"];
-        After = ["graphical-session-pre.target"];
-      };
-      Service = {
-        ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
-        Restart = "on-failure";
-      };
-    };
     gtklock = {
       Unit = {
         Requisite = ["graphical-session.target"];
@@ -247,7 +224,7 @@ in {
                 fi
                 monitors+=([$monitor]="$blurred_path")
             done < <(wpaperctl all-wallpapers -j | jq -c ".[]")
-            wait
+            # wait
 
             cp --no-preserve=mode ${pkgs.writeText "gtklock.css" ''
               #window-box {
@@ -273,7 +250,7 @@ in {
         ];
         NotifyAccess = "all";
         ExecStart = ''${lib.getExe pkgs.gtklock} -s "''${RUNTIME_DIRECTORY}/style.css" -L ${pkgs.writeShellScript "after-lock" ''
-          ${cfg.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms off
+          ${lib.getExe cfg.programs.niri.package} msg action power-off-monitors
           ${config.systemd.package}/bin/systemd-notify --ready
         ''}'';
       };
@@ -322,6 +299,21 @@ in {
         ExecStopPost = "${pkgs.coreutils}/bin/rm -rfv \"$CACHE_DIRECTORY\"";
       };
     };
+    wpaperd = {
+      Install = {
+        WantedBy = ["graphical-session.target"];
+      };
+      Unit = {
+        BindsTo = ["graphical-session-pre.target"];
+        After = ["graphical-session-pre.target"];
+      };
+      Service = {
+        ExecStart = lib.getExe cfg.programs.wpaperd.package;
+        Type = "simple";
+        Restart = "always";
+        RestartSec = "2s";
+      };
+    };
   } // listToAttrs (map ({host, port}: nameValuePair "proxy-to-autossh-socks@${toString port}" {
       Unit = {
         Requires = ["autossh-socks@${host}:${toString (port + 1)}.service" "proxy-to-autossh-socks@${toString port}.socket"];