[nix-darwin] Pin to 25.05

home/home-darwin-work.nix

@@ -31,6 +31,19 @@ in
     };
   };
 
+  # Auto-start aerospace on login
+  # NOTE: In 25.11+, this can be simplified to `programs.aerospace.launchd.enable = true`
+  launchd.agents.aerospace = {
+    enable = true;
+    config = {
+      Program = "${pkgs.aerospace}/Applications/AeroSpace.app/Contents/MacOS/AeroSpace";
+      RunAtLoad = true;
+      KeepAlive = true;
+      StandardOutPath = "/tmp/aerospace.log";
+      StandardErrorPath = "/tmp/aerospace.err.log";
+    };
+  };
+
   # Override Darwin-incompatible settings from base role
   programs.rbw.settings.pinentry = lib.mkForce pkgs.pinentry_mac;
 
@@ -64,7 +77,6 @@ in
   # TODO: Move this to its own role and/or module
   programs.aerospace = {
     enable = true;
-    launchd.enable = true;
     userSettings.mode.main.binding = {
       "${leader}-slash" = "layout tiles horizontal vertical";
       "${leader}-comma" = "layout accordion horizontal vertical";
@@ -125,9 +137,15 @@ in
 
       "${leader}-shift-e" = "exec-and-forget zsh --login -c \"emacsclient -c -n\"";
 
+      # Service mode: Deliberate aerospace window management
       "${leader}-i" = "mode service";
+
+      # Passthrough mode: Temporarily disable aerospace to use macOS shortcuts
+      # Press Cmd-P, then use any macOS shortcut (like Cmd-K in Slack), then press Cmd-P again to exit
+      "${leader}-p" = "mode passthrough";
     };
 
+    # Service mode: For deliberate aerospace window management operations
     userSettings.mode.service.binding = {
       esc = ["reload-config" "mode main"];
       r = ["flatten-workspace-tree" "mode main"]; # reset layout
@@ -139,6 +157,13 @@ in
       "${leader}-shift-k" = ["join-with up" "mode main"];
       "${leader}-shift-l" = ["join-with right" "mode main"];
     };
+
+    # Passthrough mode: All shortcuts pass through to macOS
+    # This mode has minimal bindings - just ways to exit back to main mode
+    userSettings.mode.passthrough.binding = {
+      esc = "mode main";
+      "${leader}-p" = "mode main";  # Toggle back with same key (Cmd-P)
+    };
   };
 
   home.roles = {