From 52af00482975a981bf9bbd1b825bb4c90d4529d2 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Wed, 6 Nov 2024 23:02:18 -0500
Subject: [PATCH] chore(desktop): fix breaking changes

---
 devices/wim/config/hypr/main.conf             |  2 --
 nixosModules/ags-v2/hyprland.nix              | 20 +++++++++----------
 nixosModules/ags-v2/packages.nix              | 19 +++++++++++++++---
 .../desktop/environment/modules/security.nix  |  4 ++--
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/devices/wim/config/hypr/main.conf b/devices/wim/config/hypr/main.conf
index 9b2d69ce..dd12b449 100644
--- a/devices/wim/config/hypr/main.conf
+++ b/devices/wim/config/hypr/main.conf
@@ -15,8 +15,6 @@ decoration {
         size = 3
         passes = 1
     }
-
-    drop_shadow = false
 }
 
 animations {
diff --git a/nixosModules/ags-v2/hyprland.nix b/nixosModules/ags-v2/hyprland.nix
index d09ddaaa..1e95e8e0 100644
--- a/nixosModules/ags-v2/hyprland.nix
+++ b/nixosModules/ags-v2/hyprland.nix
@@ -25,22 +25,22 @@
       exec-once = ["ags"];
 
       bind = [
-        "$mainMod SHIFT, E    , exec, ags -t win-powermenu"
-        "$mainMod      , D    , exec, ags -t win-applauncher"
-        "$mainMod      , V    , exec, ags -t win-clipboard"
-        "              , Print, exec, ags -t win-screenshot"
+        "$mainMod SHIFT, E    , exec, ags toggle win-powermenu"
+        "$mainMod      , D    , exec, ags toggle win-applauncher"
+        "$mainMod      , V    , exec, ags toggle win-clipboard"
+        "              , Print, exec, ags toggle win-screenshot"
       ];
       binde = [
         ## Brightness control
-        ", XF86MonBrightnessUp  , exec, ags -m 'Brightness.screen += 0.05'"
-        ", XF86MonBrightnessDown, exec, ags -m 'Brightness.screen -= 0.05'"
+        ", XF86MonBrightnessUp  , exec, ags request 'Brightness.screen += 0.05'"
+        ", XF86MonBrightnessDown, exec, ags request 'Brightness.screen -= 0.05'"
 
         ## Volume control
-        ", XF86AudioRaiseVolume , exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+ & ags -m 'popup_osd(\"speaker\")' &"
-        ", XF86AudioLowerVolume , exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- & ags -m 'popup_osd(\"speaker\")' &"
+        ", XF86AudioRaiseVolume , exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+ & ags request 'popup_osd(\"speaker\")' &"
+        ", XF86AudioLowerVolume , exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- & ags request 'popup_osd(\"speaker\")' &"
       ];
-      bindn = ["    , Escape   , exec, ags -m 'closeAll()'"];
-      bindr = ["CAPS, Caps_Lock, exec, ags -m 'Brightness.fetchCapsState()'"];
+      bindn = ["    , Escape   , exec, ags request 'closeAll()'"];
+      bindr = ["CAPS, Caps_Lock, exec, ags request 'Brightness.fetchCapsState()'"];
     };
   };
 }
diff --git a/nixosModules/ags-v2/packages.nix b/nixosModules/ags-v2/packages.nix
index 4735cbbb..d573b506 100644
--- a/nixosModules/ags-v2/packages.nix
+++ b/nixosModules/ags-v2/packages.nix
@@ -34,9 +34,15 @@
   in {
     programs.ags-v2.lockPkg = pkgs.writeShellApplication {
       name = "lock";
+      runtimeInputs = [agsFull];
       text = ''
         export CONF="lock"
-        exec ${agsFull}/bin/ags --config ${fullConfPath} -i lock "$@"
+
+        if [ "$#" == 0 ]; then
+          exec ags run ${fullConfPath}
+        else
+          exec ags "$@" -i lock
+        fi
       '';
     };
 
@@ -45,16 +51,23 @@
         [
           (pkgs.writeShellApplication {
             name = "ags";
+            runtimeInputs = [agsFull];
             text = ''
               export CONF="${hostName}"
-              exec ${agsFull}/bin/ags --config ${fullConfPath} "$@"
+
+              if [ "$#" == 0 ]; then
+                exec ags run ${fullConfPath}
+              else
+                exec ags "$@"
+              fi
             '';
           })
           (pkgs.writeShellApplication {
             name = "agsConf";
+            runtimeInputs = [agsFull];
             text = ''
               export CONF="$1"
-              exec ${agsFull}/bin/ags --config ${fullConfPath}
+              exec ${agsFull}/bin/ags run ${fullConfPath}
             '';
           })
         ]
diff --git a/nixosModules/desktop/environment/modules/security.nix b/nixosModules/desktop/environment/modules/security.nix
index 6f5dc8ca..9814d580 100644
--- a/nixosModules/desktop/environment/modules/security.nix
+++ b/nixosModules/desktop/environment/modules/security.nix
@@ -62,11 +62,11 @@
 
           case "$state" in
               *open*)
-                  ${getExe runInDesktop} "${getExe lockPkg} -m 'authFinger()'"
+                  ${getExe runInDesktop} "${getExe lockPkg} request 'authFinger()'"
                   ;;
 
               *close*)
-                  ${getExe runInDesktop} ${getExe lockPkg}
+                  ${getExe runInDesktop} "${getExe lockPkg}"
                   ;;
 
               *)