3 files changed, 81 insertions, 54 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 47d2212b..e6cbd77d 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -88,55 +88,7 @@ let
     exec -a "$1" "$@"
   '';
 
-  lockCommand = pkgs.writeShellScript "gtklock" ''
-    set -x
-
-    export PATH="${lib.makeBinPath [cfg.programs.wpaperd.package pkgs.jq pkgs.coreutils pkgs.gtklock pkgs.imagemagick pkgs.findutils pkgs.libsForQt5.qt5.qttools pkgs.systemd]}:$PATH"
-
-    qdbus org.keepassxc.KeePassXC.MainWindow /keepassxc org.keepassxc.KeePassXC.MainWindow.lockAllDatabases
-    systemctl --user --no-block stop gpg-agent.service
-
-    tmpDir=$(mktemp -d --tmpdir="$RUNTIME_DIRECTORY" "gtklock.$(date -uIs).XXXXXXXX")
-
-    args=()
-
-    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);
-      }
-    ''} "$tmpDir"/style.css
-
-    monitors=()
-    while IFS= read -r entry; do
-        path=$(jq -r ".path" <<<"$entry")
-        [[ -z "$path" || ! -f "$path" ]] && continue
-        display=$(jq -r ".display" <<<"$entry")
-        monitors+=("$display")
-        # ln -s "$path" "$tmpDir"/"$display"."''${path##*.}"
-        magick "$path" -filter Gaussian -resize 6.25% -define filter:sigma=2.5 -resize 1600% "$tmpDir"/"$display"."''${path##*.}" &
-    done < <(wpaperctl all-wallpapers -j | jq -c ".[]")
-    wait
-    for monitor in "''${monitors[@]}"; do
-    path=$(find "$tmpDir" -name "$monitor"'.*')
-    cat >>"$tmpDir"/style.css <<EOF
-    window#''${monitor} {
-      background-image: url("''${path}");
-      background-repeat: no-repeat;
-      background-size: 100% 100%;
-      background-origin: content-box;
-    }
-    EOF
-    done
-    args+=("-s" "$tmpDir"/style.css)
-
-    args+=("$@")
-    exec gtklock "''${args[@]}"
-  '';
+  lockCommand = "${config.systemd.package}/bin/systemctl --user start gtklock.service";
 in {
   imports = with flake.nixosModules.userProfiles.${userName}; [
     mpv yt-dlp (args: import ./xcompose.nix (inputs // args))
@@ -659,16 +611,15 @@ in {
         swayidle = {
           enable = true;
           events = [
-            { event = "before-sleep"; command = "${lockCommand} -d"; }
+            { event = "before-sleep"; command = lockCommand; }
             { event = "after-resume"; command = "${cfg.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms on"; }
-            { event = "lock"; command = "${lockCommand} -d"; }
+            { event = "lock"; command = lockCommand; }
           ];
           timeouts = [
             { timeout = 300;
               command = "${cfg.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms off";
-              resumeCommand = "${cfg.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms on";
             }
-            { timeout = 330; command = "${lockCommand} -d"; }
+            { timeout = 330; command = lockCommand; }
           ];
           extraArgs = [
             "idlehint" "30"
diff --git a/accounts/gkleen@sif/hyprland.nix b/accounts/gkleen@sif/hyprland.nix
index 23cbc972..15491c6f 100644
--- a/accounts/gkleen@sif/hyprland.nix
+++ b/accounts/gkleen@sif/hyprland.nix
@@ -72,6 +72,8 @@ in {
     disable_hyprland_logo = true;
     disable_splash_rendering = true;
     focus_on_activate = true;
+    mouse_move_enables_dpms = true;
+    key_press_enables_dpms = true;
   };
 
   cursor = {
diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix
index be016b09..613d034a 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -1,7 +1,7 @@
 { pkgs, lib, config, userName, ... }:
 let
   inherit (lib) listToAttrs nameValuePair;
-  
+
   xmobar = import ./xmobar pkgs.haskellPackages;
   cfg = config.home-manager.users.${userName};
 
@@ -204,6 +204,80 @@ in {
         WatchdogSec = "2s";
       };
     };
+    polkit-kde-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.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1";
+        Restart = "on-failure";
+      };
+    };
+    gtklock = {
+      Unit = {
+        Requisite = ["graphical-session.target"];
+        PartOf = ["graphical-session.target"];
+      };
+      Service = {
+        Type = "notify";
+        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"
+
+            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);
+              }
+            ''} "$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
+          '')
+        ];
+        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
+        ''}'';
+      };
+    };
   } // 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"];