aerospace: update keymaps

Author: cange

aerospace/aerospace.toml

@@ -14,7 +14,7 @@ after-login-command = []
 # Available commands : https://nikitabobko.github.io/AeroSpace/commands
 after-startup-command = [
   # https://github.com/FelixKratz/JankyBorders?tab=readme-ov-file#bootstrap-with-aerospace
-  'exec-and-forget borders active_color=0xffcbd9d8 inactive_color=0x00000000 width=4.0'
+  'exec-and-forget borders active_color=0xff8eb2af inactive_color=0x00000000 width=4.0'
 ]
 
 # Start AeroSpace at login
@@ -91,26 +91,21 @@ alt-t = 'layout tiles horizontal vertical'
 alt-a = 'layout accordion horizontal vertical'
 
 # See: https://nikitabobko.github.io/AeroSpace/commands#focus
-alt-shift-left = 'focus left'
-alt-shift-right = 'focus right'
-alt-shift-up = 'focus up'
-alt-shift-down = 'focus down'
-
-alt-h = 'focus left'
-alt-j = 'focus down'
-alt-k = 'focus up'
-alt-l = 'focus right'
+alt-ctrl-left  = 'focus left'
+alt-ctrl-down  = 'focus down'
+alt-ctrl-up    = 'focus up'
+alt-ctrl-right = 'focus right'
 
 alt-f = 'fullscreen'
 # Toggle windows in and out of the tiling layout/floating
 # See: https://nikitabobko.github.io/AeroSpace/commands#default-root-container-layout
 alt-shift-f = 'layout floating tiling'
 
 # See: https://nikitabobko.github.io/AeroSpace/commands#move
-alt-shift-h = 'move left'
-alt-shift-j = 'move down'
-alt-shift-k = 'move up'
-alt-shift-l = 'move right'
+alt-ctrl-shift-left  = 'move left'
+alt-ctrl-shift-down  = 'move down'
+alt-ctrl-shift-up    = 'move up'
+alt-ctrl-shift-right = 'move right'
 
 # See: https://nikitabobko.github.io/AeroSpace/commands#resize
 alt-minus = 'resize smart -100'
@@ -167,73 +162,76 @@ alt-shift-l = ['join-with right', 'mode main']
 
 #
 # Auto window detection
-#
-[[on-window-detected]]
-if.app-id = 'com.github.wez.wezterm'
-run = "move-node-to-workspace 1"
 
+# === 1 =======================================================================
 [[on-window-detected]]
 if.app-id = 'com.mitchellh.ghostty'
 run = "move-node-to-workspace 1"
 
-# Firefox
+# === 2 =======================================================================
 [[on-window-detected]]
 if.app-id = 'org.mozilla.firefoxdeveloperedition'
-if.window-title-regex-substring = 'Picture-in-Picture'
-run = ['layout floating',  'move-node-to-workspace 3']
-check-further-callbacks = true
+run = 'move-node-to-workspace 2'
 
-# Chrome Browser
 [[on-window-detected]]
 if.app-id = 'com.google.Chrome'
-if.window-title-regex-substring = 'Picture in Picture'
-run = ['layout floating',  'move-node-to-workspace 3']
-check-further-callbacks = true
+run = 'move-node-to-workspace 2'
 
 [[on-window-detected]]
-if.app-id = 'com.DanPristupov.Fork'
-run = ["move-node-to-workspace 4"]
+if.window-title-regex-substring = 'Picture.*Picture'
+run = ['layout floating',  'move-node-to-workspace 2']
+check-further-callbacks = true
 
+# === 3 =======================================================================
 [[on-window-detected]]
-if.app-id = 'com.spotify.client'
-run = "move-node-to-workspace 5"
+if.app-id = 'com.apple.finder'
+run = ['layout floating', 'move-node-to-workspace 3']
 
 [[on-window-detected]]
-if.app-id = 'com.apple.finder'
-run = ["layout floating", "move-node-to-workspace 6"]
+if.app-id = 'com.nordsec.nordpass'
+run = ['layout floating', 'move-node-to-workspace 3']
 
 [[on-window-detected]]
-if.app-id = 'md.obsidian'
-run = 'move-node-to-workspace 4'
+if.app-id = 'com.1password.1password'
+run = ['layout floating', 'move-node-to-workspace 3']
 
+# === 4 =======================================================================
 [[on-window-detected]]
-if.app-id = 'com.zscaler.zscaler'
-run = 'move-node-to-workspace 5'
+if.app-id = 'com.DanPristupov.Fork'
+run = 'move-node-to-workspace 4'
 
 [[on-window-detected]]
 if.app-id = 'com.jetbrains.intellij.ce'
-run = 'move-node-to-workspace 5'
+run = 'move-node-to-workspace 4'
 
 [[on-window-detected]]
-if.app-id = 'com.1password.1password'
-run = ['layout floating', 'move-node-to-workspace 5']
+if.app-id = 'com.google.android.studio'
+run = 'move-node-to-workspace 4'
 
 [[on-window-detected]]
-if.app-id = 'com.nordsec.nordpass'
-run = ['layout floating', 'move-node-to-workspace 5']
+if.app-id = 'com.zscaler.zscaler'
+run = ['layout floating', 'move-node-to-workspace 4']
 
 [[on-window-detected]]
 if.app-id = 'com.microsoft.teams2'
-run = ['layout tiling', 'move-node-to-workspace 3']
+run = ['layout tiling', 'move-node-to-workspace 4']
+
+# === 5 =======================================================================
+[[on-window-detected]]
+if.app-id = 'com.spotify.client'
+run = "move-node-to-workspace 5"
+
+[[on-window-detected]]
+if.app-id = 'md.obsidian'
+run = 'move-node-to-workspace 5'
 
 [[on-window-detected]]
 if.app-id = 'com.docker.docker'
-run = ['layout floating', 'move-node-to-workspace 4']
+run = ['layout floating', 'move-node-to-workspace 5']
 
 # https://nikitabobko.github.io/AeroSpace/guide#assign-workspaces-to-monitors
 [workspace-to-monitor-force-assignment]
   1 = ['C34H89x', 'main']
-  2 = ['dell.*\(2\)', 'C34H89x', 'main' ]
-  3 = ['dell.*\(1\)', 'main' ]
-  4 = ['dell.*\(1\)', 'C34H89x', 'main' ]
-
+  2 = ['dell.*\(1\)', 'C34H89x', 'main' ]
+  3 = ['dell.*\(2\)', 'C34H89x', 'main' ]
+  4 = ['dell.*\(2\)', 'main' ]