1 files changed, 86 insertions, 58 deletions

diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix
index 119d8cc3..a89b46c2 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -123,16 +123,8 @@ in {
     };
     emacs = {
       Unit = {
-        After = ["graphical-session-pre.target"];
-      };
-    };
-    dunst = {
-      Service = {
-        ExecStart = lib.mkForce "${cfg.services.dunst.package}/bin/dunst";
-        Restart = "always";
-      };
-      Install = {
-        WantedBy = ["graphical-session.target"];
+        After = [ "graphical-session.target" ];
+        BindsTo = [ "graphical-session.target" ];
       };
     };
     keepassxc = {
@@ -144,8 +136,8 @@ in {
         Environment = [ "QT_QPA_PLATFORM=wayland" ];
       };
       Unit = {
-        Requires = ["graphical-session-pre.target"];
-        After = ["graphical-session-pre.target"];
+        After = [ "graphical-session.target" ];
+        BindsTo = [ "graphical-session.target" ];
       };
     };
     mpris-proxy = {
@@ -193,8 +185,8 @@ in {
         WantedBy = ["graphical-session.target"];
       };
       Unit = {
-        Requires = ["graphical-session-pre.target"];
-        After = ["graphical-session-pre.target"];
+        After = [ "graphical-session.target" ];
+        PartOf = [ "graphical-session.target" ];
       };
       Service = {
         ExecStart = lib.getExe pkgs.psi-notify;
@@ -207,6 +199,7 @@ in {
     gtklock = {
       Unit = {
         Requisite = ["graphical-session.target"];
+        After = [ "graphical-session.target" ];
         PartOf = ["graphical-session.target"];
       };
       Service = {
@@ -214,53 +207,55 @@ in {
         RuntimeDirectory = "gtklock";
         CacheDirectory = "gtklock";
         ExecStartPre = [
-          "${pkgs.libsForQt5.qt5.qttools.bin}/bin/qdbus org.keepassxc.KeePassXC.MainWindow /keepassxc org.keepassxc.KeePassXC.MainWindow.lockAllDatabases"
-          "${config.systemd.package}/bin/systemctl --user stop gpg-agent.service"
-          (pkgs.writeShellScript "generate-css" ''
-            set -x
-            export PATH="${lib.makeBinPath [cfg.programs.wpaperd.package pkgs.jq pkgs.coreutils pkgs.imagemagick pkgs.findutils]}:$PATH"
+          "-${lib.getExe' pkgs.libsForQt5.qt5.qttools.bin "qdbus"} org.keepassxc.KeePassXC.MainWindow /keepassxc org.keepassxc.KeePassXC.MainWindow.lockAllDatabases"
+          "-${lib.getExe' config.systemd.package "systemctl"} --user stop gpg-agent.service"
+          "-${lib.getExe pkgs.playerctl} -a pause"
+          "-${lib.getExe (pkgs.writeShellApplication {
+            name = "generate-css";
+            runtimeInputs = with pkgs; [cfg.programs.wpaperd.package jq coreutils imagemagick findutils];
+            text = ''
+              declare -A monitors
+              monitors=()
+              while IFS= read -r entry; do
+                  path=$(jq -r ".path" <<<"$entry")
+                  [[ -z "$path" || ! -f "$path" ]] && continue
+                  blurred_path="$CACHE_DIRECTORY"/"$(b2sum -l 128 <<<"$path" | cut -d' ' -f1)"."''${path##*.}"
+                  monitor=$(jq -r ".display" <<<"$entry")
+                  if [[ ! -f "$blurred_path" ]]; then
+                      mkdir -p "$(dirname "$blurred_path")"
+                      magick "$path" -filter Gaussian -resize 6.25% -define filter:sigma=2.5 -resize 1600% "$blurred_path" &
+                  fi
+                  monitors+=([$monitor]="$blurred_path")
+              done < <(wpaperctl all-wallpapers -j | jq -c ".[]")
+              # wait
 
-            declare -A monitors
-            monitors=()
-            while IFS= read -r entry; do
-                path=$(jq -r ".path" <<<"$entry")
-                [[ -z "$path" || ! -f "$path" ]] && continue
-                blurred_path="$CACHE_DIRECTORY"/"$(b2sum -l 128 <<<"$path" | cut -d' ' -f1)"."''${path##*.}"
-                monitor=$(jq -r ".display" <<<"$entry")
-                if [[ ! -f "$blurred_path" ]]; then
-                    mkdir -p "$(dirname "$blurred_path")"
-                    magick "$path" -filter Gaussian -resize 6.25% -define filter:sigma=2.5 -resize 1600% "$blurred_path" &
-                fi
-                monitors+=([$monitor]="$blurred_path")
-            done < <(wpaperctl all-wallpapers -j | jq -c ".[]")
-            wait
-
-            cp --no-preserve=mode ${pkgs.writeText "gtklock.css" ''
-              #window-box {
-                padding: 64px;
-                /* border: 1px solid black; */
-                border-radius: 4px;
-                box-shadow: rgba(0, 0, 0, 0.8) 0px 4px 12px;
-                /* background-color: white; */
-                background-color: rgba(0, 0, 0, 0.5);
+              cp --no-preserve=mode ${pkgs.writeText "gtklock.css" ''
+                #window-box {
+                  padding: 64px;
+                  /* border: 1px solid black; */
+                  border-radius: 4px;
+                  box-shadow: rgba(0, 0, 0, 0.8) 0px 4px 12px;
+                  /* background-color: white; */
+                  background-color: rgba(0, 0, 0, 0.5);
+                }
+              ''} "$RUNTIME_DIRECTORY"/style.css
+              for monitor in "''${!monitors[@]}"; do
+              cat >>"$RUNTIME_DIRECTORY"/style.css <<EOF
+              window#''${monitor} {
+                background-image: url("''${monitors[$monitor]}");
+                background-repeat: no-repeat;
+                background-size: 100% 100%;
+                background-origin: content-box;
               }
-            ''} "$RUNTIME_DIRECTORY"/style.css
-            for monitor in "''${!monitors[@]}"; do
-            cat >>"$RUNTIME_DIRECTORY"/style.css <<EOF
-            window#''${monitor} {
-              background-image: url("''${monitors[$monitor]}");
-              background-repeat: no-repeat;
-              background-size: 100% 100%;
-              background-origin: content-box;
-            }
-            EOF
-            done
-          '')
+              EOF
+              done
+            '';
+          })}"
         ];
         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
-          ${config.systemd.package}/bin/systemd-notify --ready
+          ${lib.getExe cfg.programs.niri.package} msg action power-off-monitors
+          ${lib.getExe' config.systemd.package "systemd-notify"} --ready
         ''}'';
       };
     };
@@ -313,8 +308,8 @@ in {
         WantedBy = ["graphical-session.target"];
       };
       Unit = {
-        BindsTo = ["graphical-session-pre.target"];
-        After = ["graphical-session-pre.target"];
+        After = [ "graphical-session.target" ];
+        PartOf = [ "graphical-session.target" ];
       };
       Service = {
         ExecStart = lib.getExe cfg.programs.wpaperd.package;
@@ -323,6 +318,36 @@ in {
         RestartSec = "2s";
       };
     };
+    xembed-sni-proxy = {
+      Unit = {
+        PartOf = lib.mkForce ["tray.target"];
+        BindsTo = ["xwayland-satellite.service"];
+        After = ["xwayland-satellite.service"];
+      };
+    };
+    poweralertd = {
+      Unit = {
+        After = ["graphical-session.target"];
+      };
+    };
+    network-manager-applet = {
+      Unit = {
+        PartOf = lib.mkForce ["tray.target"];
+      };
+    };
+    udiskie = {
+      Unit = {
+        PartOf = lib.mkForce ["tray.target"];
+      };
+    };
+    blueman-applet = {
+      Unit = {
+        PartOf = lib.mkForce ["tray.target"];
+      };
+      Install = {
+        WantedBy = lib.mkForce ["tray.target"];
+      };
+    };
   } // 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"];
@@ -373,6 +398,9 @@ in {
     };
     tray = {
       Unit = {
+        PartOf = [ "graphical-session.target" ];
+        Requires = [ "waybar.service" ];
+        After = [ "graphical-session.target" "waybar.service" ];
         Wants = ["blueman-applet.service" "udiskie.service" "network-manager-applet.service"];
       };
     };