From 571328d2bf6877aa3c4510cbe175b4e18bbc9bb0 Mon Sep 17 00:00:00 2001
From: Poby <87608318+smg1024@users.noreply.github.com>
Date: Fri, 27 Mar 2026 23:44:19 +0900
Subject: [PATCH] fix(desktop): aerospace resize mode

---
 modules/aspects/desktop.nix | 116 ++++++++++++------------------------
 1 file changed, 37 insertions(+), 79 deletions(-)

diff --git a/modules/aspects/desktop.nix b/modules/aspects/desktop.nix
index d2c1a1d..0e8bedd 100644
--- a/modules/aspects/desktop.nix
+++ b/modules/aspects/desktop.nix
@@ -34,91 +34,49 @@
           alt-shift-j = "move down";
           alt-shift-k = "move up";
           alt-shift-l = "move right";
-          alt-minus = "resize smart -50";
-          alt-equal = "resize smart +50";
-          alt-1 = "workspace 1";
-          alt-2 = "workspace 2";
-          alt-3 = "workspace 3";
-          alt-4 = "workspace 4";
-          alt-5 = "workspace 5";
-          alt-6 = "workspace 6";
-          alt-7 = "workspace 7";
-          alt-8 = "workspace 8";
-          alt-9 = "workspace 9";
-          alt-shift-1 = [
-            "move-node-to-workspace 1"
-            "workspace 1"
-          ];
-          alt-shift-2 = [
-            "move-node-to-workspace 2"
-            "workspace 2"
-          ];
-          alt-shift-3 = [
-            "move-node-to-workspace 3"
-            "workspace 3"
-          ];
-          alt-shift-4 = [
-            "move-node-to-workspace 4"
-            "workspace 4"
-          ];
-          alt-shift-5 = [
-            "move-node-to-workspace 5"
-            "workspace 5"
-          ];
-          alt-shift-6 = [
-            "move-node-to-workspace 6"
-            "workspace 6"
-          ];
-          alt-shift-7 = [
-            "move-node-to-workspace 7"
-            "workspace 7"
-          ];
-          alt-shift-8 = [
-            "move-node-to-workspace 8"
-            "workspace 8"
-          ];
-          alt-shift-9 = [
-            "move-node-to-workspace 9"
-            "workspace 9"
-          ];
+          alt-1 = "workspace --auto-back-and-forth 1";
+          alt-2 = "workspace --auto-back-and-forth 2";
+          alt-3 = "workspace --auto-back-and-forth 3";
+          alt-4 = "workspace --auto-back-and-forth 4";
+          alt-5 = "workspace --auto-back-and-forth 5";
+          alt-6 = "workspace --auto-back-and-forth 6";
+          alt-7 = "workspace --auto-back-and-forth 7";
+          alt-8 = "workspace --auto-back-and-forth 8";
+          alt-9 = "workspace --auto-back-and-forth 9";
+          alt-shift-1 = ["move-node-to-workspace 1" "workspace --auto-back-and-forth 1"];
+          alt-shift-2 = ["move-node-to-workspace 2" "workspace --auto-back-and-forth 2"];
+          alt-shift-3 = ["move-node-to-workspace 3" "workspace --auto-back-and-forth 3"];
+          alt-shift-4 = ["move-node-to-workspace 4" "workspace --auto-back-and-forth 4"];
+          alt-shift-5 = ["move-node-to-workspace 5" "workspace --auto-back-and-forth 5"];
+          alt-shift-6 = ["move-node-to-workspace 6" "workspace --auto-back-and-forth 6"];
+          alt-shift-7 = ["move-node-to-workspace 7" "workspace --auto-back-and-forth 7"];
+          alt-shift-8 = ["move-node-to-workspace 8" "workspace --auto-back-and-forth 8"];
+          alt-shift-9 = ["move-node-to-workspace 9" "workspace --auto-back-and-forth 9"];
           alt-tab = "workspace-back-and-forth";
           alt-shift-tab = "move-node-to-monitor --wrap-around next";
+
+          cmd-h = [];
+          cmd-alt-h = [];
+
           alt-shift-semicolon = "mode service";
+          alt-shift-r = "mode resize";
         };
 
         mode.service.binding = {
-          esc = [
-            "reload-config"
-            "mode main"
-          ];
-          r = [
-            "flatten-workspace-tree"
-            "mode main"
-          ];
-          f = [
-            "layout floating tiling"
-            "mode main"
-          ];
-          backspace = [
-            "close-all-windows-but-current"
-            "mode main"
-          ];
-          alt-shift-h = [
-            "join-with left"
-            "mode main"
-          ];
-          alt-shift-j = [
-            "join-with down"
-            "mode main"
-          ];
-          alt-shift-k = [
-            "join-with up"
-            "mode main"
-          ];
-          alt-shift-l = [
-            "join-with right"
-            "mode main"
-          ];
+          esc = ["reload-config" "mode main"];
+          r = ["flatten-workspace-tree" "mode main"];
+          f = ["layout floating tiling" "mode main"];
+          backspace = ["close-all-windows-but-current" "mode main"];
+          alt-shift-h = ["join-with left" "mode main"];
+          alt-shift-j = ["join-with down" "mode main"];
+          alt-shift-k = ["join-with up" "mode main"];
+          alt-shift-l = ["join-with right" "mode main"];
+        };
+
+        mode.resize.binding = {
+          minus = "resize smart -50";
+          equal = "resize smart +50";
+          esc = "mode main";
         };
 
         on-window-detected = [