Simplify aerospace to align with dwm, add skhd back again

docs/post-run.md

@@ -14,4 +14,8 @@
 - aerospace
     - grant aerospace permission in accessibility settings
     - likely need system reboot before aerospace works
+- skhd
+    - run `skhd --start-service`
+    - grant skhd permission in accessibility settings
+    - run `skhd --restart-service`
 

installs_and_builds/programs.csv

@@ -34,4 +34,5 @@ tenacity,package_manager,macos: name='--cask audacity',,work: name='',tenacity n
 bitwig-studio,package_manager,macos: name='--cask bitwig-studio',artix: kind='aur'; arch: kind='aur'; debian: kind='build_custom';,work: name='',
 gimp,package_manager,macos: name='--cask gimp',,,
 --cask nikitabobko/tap/aerospace,package_manager,linux: name='',,,
+koekeishiya/formulae/skhd,package_manager,linux: name='',,,
 pandoc,package_manager,,arch: name='pandoc-cli'; artix: name='pandoc-bin';,work: name='',

src_files/.config/aerospace/aerospace.toml

@@ -25,23 +25,18 @@ default-root-container-orientation = 'vertical' # opts: horizontal vertical auto
     outer.right =      0
 
 [mode.main.binding]
+    # layouts
     cmd-comma = 'layout v_accordion'
     cmd-period = 'layout h_tiles'
-    cmd-slash = 'layout horizontal vertical'
+    cmd-slash = 'layout floating'
 
+    # window resizing
     alt-minus = 'resize smart -50'
     alt-equal = 'resize smart +50'
 
-    # in stack mode, new windows are added "below" the current, so swap up and down
+    # window focus/view
-    cmd-j = 'focus up'
+    cmd-j = 'focus up' # new windows are added "below" current, so swap up and down
     cmd-k = 'focus down'
-    cmd-l = 'focus right'
-    cmd-h = 'focus left'
-    cmd-shift-j = 'move up'
-    cmd-shift-k = 'move down'
-    cmd-shift-h = 'move left'
-    cmd-shift-l = 'move right'
-
     cmd-1 = 'workspace 1'
     cmd-2 = 'workspace 2'
     cmd-3 = 'workspace 3'
@@ -52,6 +47,10 @@ default-root-container-orientation = 'vertical' # opts: horizontal vertical auto
     cmd-8 = 'workspace 8'
     cmd-9 = 'workspace 9'
     cmd-0 = 'workspace 10'
+
+    # window movement
+    cmd-shift-j = 'move up' # new windows are added "below" current, so swap up and down
+    cmd-shift-k = 'move down'
     cmd-shift-1 = 'move-node-to-workspace 1'
     cmd-shift-2 = 'move-node-to-workspace 2'
     cmd-shift-3 = 'move-node-to-workspace 3'
@@ -63,13 +62,3 @@ default-root-container-orientation = 'vertical' # opts: horizontal vertical auto
     cmd-shift-9 = 'move-node-to-workspace 9'
     cmd-shift-0 = 'move-node-to-workspace 10'
 
-    cmd-shift-semicolon = 'mode service'
-
-[mode.service.binding]
-    r = ['reload-config', 'flatten-workspace-tree', 'mode main'] # reset layout
-    f = ['flatten-workspace-tree', 'layout floating', 'mode main']
-    cmd-h = ['join-with left', 'mode main']
-    cmd-j = ['join-with down', 'mode main']
-    cmd-k = ['join-with up', 'mode main']
-    cmd-l = ['join-with right', 'mode main']
-

src_files/.config/nvim/lua/key_mappings.lua

@@ -133,18 +133,6 @@ kmgAutocmd('LspAttach', {
     end
 })
 
-------------------------------------------------------------------------------------------
--- git stuff
-
-vim.keymap.set("n", "<leader>ga", function() vim.cmd("silent !git add %") end)
-vim.keymap.set("n", "<leader>gs", function() TmpBuff("new"); ReadShellCmd('git status') end)
-vim.keymap.set("n", "<leader>gl", function() TmpBuff("vnew"); ReadShellCmd('git log') end)
-vim.keymap.set("n", "<leader>gg", function()
-    TmpBuff()
-    ReadShellCmd('git ' .. vim.fn.input('git '))
-end)
-vim.keymap.set("n", "<leader>gG", ":Git ") -- use fugitive plugin's generic git command
-
 ------------------------------------------------------------------------------------------
 -- plugins
 
@@ -176,6 +164,13 @@ for i = 1, 10, 1 do
     vim.keymap.set("n", "<leader>h" .. (i % 10), function() harpoon:list():replace_at(i) end)
 end
 
+--- fugitive (git integration)
+vim.keymap.set("n", "<leader>gg", ":Git ") -- shortcut, arbitrary git commands
+vim.keymap.set("n", "<leader>ga", function() vim.cmd.Git({ "add %"}) end)
+vim.keymap.set("n", "<leader>gl", function() vim.cmd.Git({ "log"}) end)
+vim.keymap.set("n", "<leader>gs", function() vim.cmd.Git({ "-p status" }) end)
+vim.keymap.set("n", "<leader>gc", function() vim.cmd.Git({ "commit -a" }) end)
+
 -- undotree
 vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
 

src_files/.config/skhd/skhdrc

@@ -0,0 +1,5 @@
+# ref: built-in keywords, https://github.com/koekeishiya/skhd/issues/1
+
+cmd - h : $(which skhd) -k "ctrl + shift - tab"
+cmd - l : $(which skhd) -k "ctrl - tab"
+