fix hyprrun

system/users/nathan/home-manager/dotfiles/hypr/main.conf

@@ -259,20 +259,20 @@ bindm = $mainMod SHIFT, mouse:272, resizewindow
 
 $scratchpadsize = size 60% 80%
 
-$kitty = class:^(scratchpad-kitty)$
-windowrulev2 = float, $kitty
-windowrulev2 = $scratchpadsize, $kitty
-windowrulev2 = workspace special silent, $kitty
+$kitty = ^(scratchpad-kitty)$
+windowrule = float on, match:class $kitty
+windowrule = $scratchpadsize, match:class $kitty
+windowrule = workspace special silent, match:class $kitty
 
-$lf = class:^(scratchpad-lf)$
-windowrulev2 = float, $lf
-windowrulev2 = $scratchpadsize, $lf
-windowrulev2 = workspace special silent, $lf
+$lf = ^(scratchpad-lf)$
+windowrule = float on, match:class $lf
+windowrule = $scratchpadsize, match:class $lf
+windowrule = workspace special silent, match:class $lf
 
-$cal = class:^(scratchpad-cal)$
-windowrulev2 = float, $cal
-windowrulev2 = $scratchpadsize, $cal
-windowrulev2 = workspace special silent, $cal
+$cal = ^(scratchpad-cal)$
+windowrule = float on, match:class $cal
+windowrule = $scratchpadsize, match:class $cal
+windowrule = workspace special silent, match:class $cal
 
 bind = $mainMod, semicolon, exec, pypr toggle lf
 bind = $mainMod, E, exec, pypr toggle kitty

system/users/nathan/home-manager/packages/scripts/default.nix

@@ -7,7 +7,24 @@
         };
     };
 
-    config = lib.mkIf config.homeconfig.scripts.enable {
+    config = lib.mkMerge [
+    (lib.mkIf (config.homeconfig.hyprland.enable && config.homeconfig.scripts.enable) {
+        home.packages = [
+            (pkgs.writeShellScriptBin "hyprrun" ''
+                uwsm app -- ''$@
+            '')
+        ];
+    })
+
+    (lib.mkIf (!config.homeconfig.hyprland.enable && config.homeconfig.scripts.enable) {
+        home.packages = [
+            (pkgs.writeShellScriptBin "hyprrun" ''
+                eval "''$@"
+            '')
+        ];
+    })
+
+    (lib.mkIf config.homeconfig.scripts.enable {
         home.packages = [
 
             #scripts
@@ -102,6 +119,7 @@
 	        '')
 
         ];
-    };
+    })
+    ];
 }
 

system/users/nathan/home-manager/programs/terminal/zsh/default.nix

@@ -21,11 +21,6 @@
 
       python = "python3.13";
       python3 = "python3.13";
-
-      hyprrun = with lib; mkMerge [
-        (mkIf config.homeconfig.hyprland.enable "uwsm app --")
-        (mkIf (!config.homeconfig.hyprland.enable) ";")
-      ];
     };
 
     history = {