hyprland: use launch.sh for on-created-empty workspaces

Signed-off-by: Myned <dev@bjork.tech>

options/custom/desktops/hyprland/binds.nix

@@ -111,7 +111,7 @@ in {
         (key "Control_L" "Super+Ctrl" "exec" workspace)
         (key "Shift_L" "Super+Shift" "workspace" "previous")
         (key "Super_L" "Super" "exec" "${menu}")
-        (key "Super_L" "Super+Alt" "exec" "${menu} --passwords")
+        #// (key "Super_L" "Super+Alt" "exec" "${menu} --passwords")
         (key "Super_L" "Super+Ctrl" "exec" "${menu} --calculator")
         (key "Super_L" "Super+Ctrl+Shift" "exec" "${menu} --networks")
         (key "Super_L" "Super+Shift" "exec" "${menu} --search")

options/custom/desktops/hyprland/rules.nix

@@ -11,7 +11,7 @@ with lib; let
   kitty = "${config.home-manager.users.${config.custom.username}.programs.kitty.package}/bin/kitty";
   launch = config.home-manager.users.${config.custom.username}.home.file.".local/bin/launch".source;
   loupe = "${pkgs.loupe}/bin/loupe";
-  onlyoffice = "${pkgs.onlyoffice-bin}/bin/onlyoffice-desktopeditors --system-title-bar --xdg-desktop-portal";
+  onlyoffice-desktopeditors = "${pkgs.onlyoffice-bin}/bin/onlyoffice-desktopeditors --system-title-bar --xdg-desktop-portal";
   pgrep = "${pkgs.procps}/bin/pgrep";
   steam = "${config.programs.steam.package}/bin/steam";
   virt-manager = "${pkgs.virt-manager}/bin/virt-manager";
@@ -29,14 +29,14 @@ in {
       # https://wiki.hyprland.org/Configuring/Workspace-Rules
       #?? workspace = WORKSPACE, RULES
       workspace = [
-        "special:android, on-created-empty:${waydroid} app launch com.YoStarEN.Arknights"
+        "special:android, on-created-empty:${launch} --workspace special:android --empty ${waydroid} app launch com.YoStarEN.Arknights"
         "special:gamescope, on-created-empty:MANGOHUD=0 ${gamescope} --fullscreen --steam ${steam}"
         "special:music, on-created-empty:${youtube-music}"
-        #// "special:office, on-created-empty:${onlyoffice} --xdg-desktop-portal"
+        "special:office, on-created-empty:${launch} --workspace special:office --empty --tile -- ${onlyoffice-desktopeditors}"
-        "special:password, on-created-empty:${_1password}"
+        "special:password, on-created-empty:${launch} --workspace special:password --empty ${_1password}"
         "special:steam, on-created-empty:${steam}"
         "special:terminal, on-created-empty:${kitty}"
-        #// "special:vm, on-created-empty:${pgrep} -x vm || ${virt-manager}"
+        "special:vm, on-created-empty:${launch} --workspace special:vm --empty ${virt-manager}"
         "special:wallpaper, on-created-empty:${loupe} /tmp/wallpaper.png"
       ];
 
@@ -222,12 +222,8 @@ in {
             (class "ONLYOFFICE Desktop Editors" rules)
           ];
           password = rules: [
+            (class "1Password" rules)
             (class "Bitwarden" rules)
-            (fields {
-                class = "^1Password$";
-                title = "^.+1Password$"; # Main window
-              }
-              rules)
           ];
           pip = rules: [
             (title "Picture.in.[Pp]icture" rules)
@@ -264,7 +260,7 @@ in {
           (fullscreen true ["idleinhibit focus"])
           (pinned true ["bordercolor rgb(073642) rgb(073642)"])
 
-          (tag.android ["idleinhibit always" "move ${android.x} ${android.y}" "size ${android.w} ${android.h}"])
+          (tag.android ["idleinhibit always" "move ${android.x} ${android.y}" "size ${android.w} ${android.h}" "workspace special:android"])
           (tag.browser ["group override set" "tile" "workspace 1"])
           (tag.clipboard ["move ${clipboard.x} ${clipboard.y}" "pin" "size ${clipboard.w} ${clipboard.h}" "stayfocused"])
           (tag.dropdown ["move ${dropdown.x} ${dropdown.y}" "pin" "size ${dropdown.w} ${dropdown.h}"])

options/custom/programs/onlyoffice.nix

@@ -6,7 +6,7 @@
 }:
 with lib; let
   hyprctl = "${pkgs.hyprland}/bin/hyprctl";
-  onlyoffice-desktopeditors = "${pkgs.onlyoffice-bin}/bin/onlyoffice-desktopeditors";
+  onlyoffice-desktopeditors = "${pkgs.onlyoffice-bin}/bin/onlyoffice-desktopeditors --system-title-bar --xdg-desktop-portal";
 
   cfg = config.custom.programs.onlyoffice;
 in {

options/custom/scripts/launch.sh

@@ -27,7 +27,7 @@ eval "$(argc --argc-eval "$0" "$@")"
 
 if [[ "${argc_empty:-}" ]]; then
   # Delay to mitigate on-created-empty window race condition
-  sleep 1
+  sleep 0.5
 
   # Silently exit if window exists on specified workspace
   if hyprctl -j clients | jq -r .[].workspace.name | grep "${argc_workspace:-}"; then
@@ -39,7 +39,7 @@ fi
 count="$(hyprctl -j clients | jq length)"
 
 # Launch application
-hyprctl dispatch exec "${argc_commands[@]:-}"
+hyprctl dispatch exec -- "${argc_commands[@]:-}"
 
 # Poll for next window
 c=0