...

2 files changed, 8 insertions, 7 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 7d5a9c25..10180eca 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -416,11 +416,12 @@ in {
           fira fira-code pwvucontrol wrappedKeepassxc wl-clipboard-rs
           mumble pulseaudio-ctl pamixer libnotify screen-message
           wrappedYTMDesktop libsForQt5.qt5ct playerctl evince
-          thunderbird zoom-us steam steam-run wireshark virt-manager
-          rclone cached-nix-shell worktime fira-code-symbols
-          libreoffice xournalpp google-chrome nixos-shell virt-viewer
-          freerdp gnome-icon-theme paper-icon-theme sshpassSecret
-          weechat element-desktop matrix-synapse-tools.synadm
+          thunderbird zoom-us xdg-desktop-portal steam steam-run
+          wireshark virt-manager rclone cached-nix-shell worktime
+          fira-code-symbols libreoffice xournalpp google-chrome
+          nixos-shell virt-viewer freerdp gnome-icon-theme
+          paper-icon-theme sshpassSecret weechat element-desktop
+          matrix-synapse-tools.synadm
           flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs
           sieve-connect gimp inkscape udiskie glab nitrokey-app
           pynitrokey gtklock wlrctl remmina openscad spice-record
diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix
index cefcf4ea..34f52172 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -224,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 {
@@ -250,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
         ''}'';
       };