From c9bad270d2c2443105d484fa57ddc30eb5edca28 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 11 Sep 2025 15:52:57 -0500 Subject: [PATCH] Switch macos wm from yabai to aerospace --- README.md | 16 +- installs_and_builds/s06_window_manager | 6 +- ref/macos-system-settings.txt | 14 ++ src_files/.config/aerospace/aerospace.toml | 129 +++++++++++ .../aerospace/ref-aerospace-default.toml | 206 ++++++++++++++++++ src_files/.config/git/config | 2 +- src_files/.config/skhd/skhdrc | 42 ---- src_files/.config/yabai/yabairc | 35 --- 8 files changed, 357 insertions(+), 93 deletions(-) create mode 100644 ref/macos-system-settings.txt create mode 100644 src_files/.config/aerospace/aerospace.toml create mode 100644 src_files/.config/aerospace/ref-aerospace-default.toml delete mode 100755 src_files/.config/yabai/yabairc diff --git a/README.md b/README.md index f16d1c0..b5c877e 100644 --- a/README.md +++ b/README.md @@ -7,16 +7,8 @@ ### prereqs, macos - zsh is installed (scripts are written for zsh) - install the package manager, [homebrew](https://brew.sh/) -- for yabai window manager (so as to not mess with SIP settings) - - create 9 spaces/desktops - - system settings > keyboard shortcuts: set keys to switch between spaces/desktops - - system settings > desktop/dock/mission-control: - - `click wallpaper to reveal desktop`: set to "only in stage manager" - - all `drag windows to corner/edge/place` types of options: disabled - - `rearrange spaces based on recent use`: disabled - - `when switch to app... switch to space with open windows of app`: disabled - - `displays have separate spaces`: enabled - - `show files on desktop`: enabled +- for aerospace window manager, have only 1 workspace/desktop +- manual settings, refer to [macos-system-settings](ref/macos-system-settings.txt) ### script run - if repo present on system, run from the repo's root: @@ -32,10 +24,10 @@ ### todo items - choose window manager for linux, then configure -- config for: terminal (ghostty); mpd, mpc, ncmpcpp; mpv +- config for: terminal (ghostty); shell; mpd, mpc, ncmpcpp; mpv - config for gimp, `src_files/.config/GIMP` (dir) - set things in gtkrc only? still need to nest that within a sub dir? - or configure in gimp, copy resulting dir to `src_files/.config/GIMP`, call it a day - decide on and implement approach for languages and versioning - - asdf, or language-specific version managers? + - language-specific? asdf? no, not asdf, mise seems better from what i hear so far - docker? or alternatives like podman? any license concerns? diff --git a/installs_and_builds/s06_window_manager b/installs_and_builds/s06_window_manager index f80c671..b62e367 100755 --- a/installs_and_builds/s06_window_manager +++ b/installs_and_builds/s06_window_manager @@ -6,13 +6,13 @@ linux_wm_and_utils() { } macos_wm_and_utils() { - brew install koekeishiya/formulae/yabai brew install koekeishiya/formulae/skhd skhd --start-service - yabai --start-service sleep 14 # time to give permission in accessibility settings skhd --restart-service - yabai --restart-service + + # NOTE: currently, aerospace seems to need system restart to take effect + brew install --cask nikitabobko/tap/aerospace } [[ "$BOX_SETUP_OS" = "macos" ]] && macos_wm_and_utils || linux_wm_and_utils diff --git a/ref/macos-system-settings.txt b/ref/macos-system-settings.txt new file mode 100644 index 0000000..536a9ba --- /dev/null +++ b/ref/macos-system-settings.txt @@ -0,0 +1,14 @@ +// settings for manual configuration in macos system settings app +// NOTE: some of these could be scripted, but for now i'm okay with this manual list + +- desktop/dock/mission-control: + - `click wallpaper to reveal desktop`: set to "only in stage manager" + - all `drag windows to corner/edge/place` types of options: disabled + - `rearrange spaces based on recent use`: disabled + - `when switch to app... switch to space with open windows of app`: disabled + - `displays have separate spaces`: disabled + - `show files on desktop`: enabled + - `group windows by application`: enabled + +- in general, just go through most pages/options and set them as desired + diff --git a/src_files/.config/aerospace/aerospace.toml b/src_files/.config/aerospace/aerospace.toml new file mode 100644 index 0000000..20079e6 --- /dev/null +++ b/src_files/.config/aerospace/aerospace.toml @@ -0,0 +1,129 @@ +# options commands : https://nikitabobko.github.io/AeroSpace/commands +after-startup-command = [] +start-at-login = true # start aerospace at login + +# ref: https://nikitabobko.github.io/AeroSpace/guide#normalization +enable-normalization-flatten-containers = true +enable-normalization-opposite-orientation-for-nested-containers = true + +accordion-padding = 0 # ref: https://nikitabobko.github.io/AeroSpace/guide#layouts + +default-root-container-layout = 'accordion' # tiles|accordion +default-root-container-orientation = 'auto' # horizontal|vertical|auto + +# refs: https://nikitabobko.github.io/AeroSpace/guide#on-focus-changed-callbacks +# https://nikitabobko.github.io/AeroSpace/commands#move-mouse +on-focused-monitor-changed = ['move-mouse monitor-lazy-center'] + +# ref: https://nikitabobko.github.io/AeroSpace/goodies#disable-hide-app +automatically-unhide-macos-hidden-apps = true + +# See https://nikitabobko.github.io/AeroSpace/guide#key-mapping +[key-mapping] + preset = 'qwerty' # qwerty|dvorak|colemak + +# ref: https://nikitabobko.github.io/AeroSpace/guide#assign-workspaces-to-monitors +# gaps between windows (inner-*) and between monitor edges (outer-*). +[gaps] + inner.horizontal = 0 + inner.vertical = 0 + outer.left = 0 + outer.bottom = 0 + outer.top = 0 + outer.right = 0 + +# 'main' binding mode; ref: https://nikitabobko.github.io/AeroSpace/guide#binding-modes +[mode.main.binding] # 'main' binding mode must be always presented + # All possible keys: + # - Letters. a, b, c, ..., z + # - Numbers. 0, 1, 2, ..., 9 + # - Keypad numbers. keypad0, keypad1, keypad2, ..., keypad9 + # - F-keys. f1, f2, ..., f20 + # - Special keys. minus, equal, period, comma, slash, backslash, quote, semicolon, + # backtick, leftSquareBracket, rightSquareBracket, space, enter, esc, + # backspace, tab, pageUp, pageDown, home, end, forwardDelete, + # sectionSign (ISO keyboards only, european keyboards only) + # - Keypad special. keypadClear, keypadDecimalMark, keypadDivide, keypadEnter, keypadEqual, + # keypadMinus, keypadMultiply, keypadPlus + # - Arrows. left, down, up, right + + # All possible modifiers: cmd, alt, ctrl, shift + # All possible commands: https://nikitabobko.github.io/AeroSpace/commands + + # See: https://nikitabobko.github.io/AeroSpace/commands#exec-and-forget + # You can uncomment the following lines to open up terminal with alt + enter shortcut + # (like in i3) + # alt-enter = '''exec-and-forget osascript -e ' + # tell application "Terminal" + # do script + # activate + # end tell' + # ''' + + # See: https://nikitabobko.github.io/AeroSpace/commands#layout + alt-slash = 'layout tiles horizontal vertical' + alt-comma = 'layout accordion horizontal vertical' + + # See: https://nikitabobko.github.io/AeroSpace/commands#focus + alt-j = 'focus down' + alt-k = 'focus up' + # bindings: alt-l -> ctrl-tab, alt-h -> ctrl-shift-tab + # alt-l = "exec-and-forget osascript -e 'tell application \"System Events\" to key code 48 using control down'" + # alt-h = "exec-and-forget osascript -e 'tell application \"System Events\" to key code 48 using {control down, shift down}'" + + + # 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' + + # See: https://nikitabobko.github.io/AeroSpace/commands#resize + alt-minus = 'resize smart -50' + alt-equal = 'resize smart +50' + + # See: https://nikitabobko.github.io/AeroSpace/commands#workspace + 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' + + # See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace + alt-shift-1 = 'move-node-to-workspace 1' + alt-shift-2 = 'move-node-to-workspace 2' + alt-shift-3 = 'move-node-to-workspace 3' + alt-shift-4 = 'move-node-to-workspace 4' + alt-shift-5 = 'move-node-to-workspace 5' + alt-shift-6 = 'move-node-to-workspace 6' + alt-shift-7 = 'move-node-to-workspace 7' + alt-shift-8 = 'move-node-to-workspace 8' + alt-shift-9 = 'move-node-to-workspace 9' + + # See: https://nikitabobko.github.io/AeroSpace/commands#mode + alt-shift-semicolon = 'mode service' + +# 'service' binding mode declaration. +# See: https://nikitabobko.github.io/AeroSpace/guide#binding-modes +[mode.service.binding] + esc = ['reload-config', 'mode main'] + backspace = ['close-all-windows-but-current', 'mode main'] + + r = ['flatten-workspace-tree', 'mode main'] # reset layout + f = ['flatten-workspace-tree', 'layout floating', 'mode main'] + t = ['flatten-workspace-tree', 'layout tiling', 'mode main'] + s = ['layout v_accordion', 'mode main'] + g = ['layout v_tiles', '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'] + + down = 'volume down' + up = 'volume up' + shift-down = ['volume set 0', 'mode main'] diff --git a/src_files/.config/aerospace/ref-aerospace-default.toml b/src_files/.config/aerospace/ref-aerospace-default.toml new file mode 100644 index 0000000..10b8041 --- /dev/null +++ b/src_files/.config/aerospace/ref-aerospace-default.toml @@ -0,0 +1,206 @@ +# Place a copy of this config to ~/.aerospace.toml +# After that, you can edit ~/.aerospace.toml to your liking + +# You can use it to add commands that run after AeroSpace startup. +# Available commands : https://nikitabobko.github.io/AeroSpace/commands +after-startup-command = [] + +# Start AeroSpace at login +start-at-login = false + +# Normalizations. See: https://nikitabobko.github.io/AeroSpace/guide#normalization +enable-normalization-flatten-containers = true +enable-normalization-opposite-orientation-for-nested-containers = true + +# See: https://nikitabobko.github.io/AeroSpace/guide#layouts +# The 'accordion-padding' specifies the size of accordion padding +# You can set 0 to disable the padding feature +accordion-padding = 30 + +# Possible values: tiles|accordion +default-root-container-layout = 'tiles' + +# Possible values: horizontal|vertical|auto +# 'auto' means: wide monitor (anything wider than high) gets horizontal orientation, +# tall monitor (anything higher than wide) gets vertical orientation +default-root-container-orientation = 'auto' + +# Mouse follows focus when focused monitor changes +# Drop it from your config, if you don't like this behavior +# See https://nikitabobko.github.io/AeroSpace/guide#on-focus-changed-callbacks +# See https://nikitabobko.github.io/AeroSpace/commands#move-mouse +# Fallback value (if you omit the key): on-focused-monitor-changed = [] +on-focused-monitor-changed = ['move-mouse monitor-lazy-center'] + +# You can effectively turn off macOS "Hide application" (cmd-h) feature by toggling this flag +# Useful if you don't use this macOS feature, but accidentally hit cmd-h or cmd-alt-h key +# Also see: https://nikitabobko.github.io/AeroSpace/goodies#disable-hide-app +automatically-unhide-macos-hidden-apps = false + +# Possible values: (qwerty|dvorak|colemak) +# See https://nikitabobko.github.io/AeroSpace/guide#key-mapping +[key-mapping] + preset = 'qwerty' + +# Gaps between windows (inner-*) and between monitor edges (outer-*). +# Possible values: +# - Constant: gaps.outer.top = 8 +# - Per monitor: gaps.outer.top = [{ monitor.main = 16 }, { monitor."some-pattern" = 32 }, 24] +# In this example, 24 is a default value when there is no match. +# Monitor pattern is the same as for 'workspace-to-monitor-force-assignment'. +# See: +# https://nikitabobko.github.io/AeroSpace/guide#assign-workspaces-to-monitors +[gaps] + inner.horizontal = 0 + inner.vertical = 0 + outer.left = 0 + outer.bottom = 0 + outer.top = 0 + outer.right = 0 + +# 'main' binding mode declaration +# See: https://nikitabobko.github.io/AeroSpace/guide#binding-modes +# 'main' binding mode must be always presented +# Fallback value (if you omit the key): mode.main.binding = {} +[mode.main.binding] + + # All possible keys: + # - Letters. a, b, c, ..., z + # - Numbers. 0, 1, 2, ..., 9 + # - Keypad numbers. keypad0, keypad1, keypad2, ..., keypad9 + # - F-keys. f1, f2, ..., f20 + # - Special keys. minus, equal, period, comma, slash, backslash, quote, semicolon, + # backtick, leftSquareBracket, rightSquareBracket, space, enter, esc, + # backspace, tab, pageUp, pageDown, home, end, forwardDelete, + # sectionSign (ISO keyboards only, european keyboards only) + # - Keypad special. keypadClear, keypadDecimalMark, keypadDivide, keypadEnter, keypadEqual, + # keypadMinus, keypadMultiply, keypadPlus + # - Arrows. left, down, up, right + + # All possible modifiers: cmd, alt, ctrl, shift + + # All possible commands: https://nikitabobko.github.io/AeroSpace/commands + + # See: https://nikitabobko.github.io/AeroSpace/commands#exec-and-forget + # You can uncomment the following lines to open up terminal with alt + enter shortcut + # (like in i3) + # alt-enter = '''exec-and-forget osascript -e ' + # tell application "Terminal" + # do script + # activate + # end tell' + # ''' + + # See: https://nikitabobko.github.io/AeroSpace/commands#layout + alt-slash = 'layout tiles horizontal vertical' + alt-comma = 'layout accordion horizontal vertical' + + # See: https://nikitabobko.github.io/AeroSpace/commands#focus + alt-h = 'focus left' + alt-j = 'focus down' + alt-k = 'focus up' + alt-l = 'focus right' + + # 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' + + # See: https://nikitabobko.github.io/AeroSpace/commands#resize + alt-minus = 'resize smart -50' + alt-equal = 'resize smart +50' + + # See: https://nikitabobko.github.io/AeroSpace/commands#workspace + 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-a = 'workspace A' # In your config, you can drop workspace bindings that you don't need + alt-b = 'workspace B' + alt-c = 'workspace C' + alt-d = 'workspace D' + alt-e = 'workspace E' + alt-f = 'workspace F' + alt-g = 'workspace G' + alt-i = 'workspace I' + alt-m = 'workspace M' + alt-n = 'workspace N' + alt-o = 'workspace O' + alt-p = 'workspace P' + alt-q = 'workspace Q' + alt-r = 'workspace R' + alt-s = 'workspace S' + alt-t = 'workspace T' + alt-u = 'workspace U' + alt-v = 'workspace V' + alt-w = 'workspace W' + alt-x = 'workspace X' + alt-y = 'workspace Y' + alt-z = 'workspace Z' + + # See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace + alt-shift-1 = 'move-node-to-workspace 1' + alt-shift-2 = 'move-node-to-workspace 2' + alt-shift-3 = 'move-node-to-workspace 3' + alt-shift-4 = 'move-node-to-workspace 4' + alt-shift-5 = 'move-node-to-workspace 5' + alt-shift-6 = 'move-node-to-workspace 6' + alt-shift-7 = 'move-node-to-workspace 7' + alt-shift-8 = 'move-node-to-workspace 8' + alt-shift-9 = 'move-node-to-workspace 9' + alt-shift-a = 'move-node-to-workspace A' + alt-shift-b = 'move-node-to-workspace B' + alt-shift-c = 'move-node-to-workspace C' + alt-shift-d = 'move-node-to-workspace D' + alt-shift-e = 'move-node-to-workspace E' + alt-shift-f = 'move-node-to-workspace F' + alt-shift-g = 'move-node-to-workspace G' + alt-shift-i = 'move-node-to-workspace I' + alt-shift-m = 'move-node-to-workspace M' + alt-shift-n = 'move-node-to-workspace N' + alt-shift-o = 'move-node-to-workspace O' + alt-shift-p = 'move-node-to-workspace P' + alt-shift-q = 'move-node-to-workspace Q' + alt-shift-r = 'move-node-to-workspace R' + alt-shift-s = 'move-node-to-workspace S' + alt-shift-t = 'move-node-to-workspace T' + alt-shift-u = 'move-node-to-workspace U' + alt-shift-v = 'move-node-to-workspace V' + alt-shift-w = 'move-node-to-workspace W' + alt-shift-x = 'move-node-to-workspace X' + alt-shift-y = 'move-node-to-workspace Y' + alt-shift-z = 'move-node-to-workspace Z' + + # See: https://nikitabobko.github.io/AeroSpace/commands#workspace-back-and-forth + alt-tab = 'workspace-back-and-forth' + # See: https://nikitabobko.github.io/AeroSpace/commands#move-workspace-to-monitor + alt-shift-tab = 'move-workspace-to-monitor --wrap-around next' + + # See: https://nikitabobko.github.io/AeroSpace/commands#mode + alt-shift-semicolon = 'mode service' + +# 'service' binding mode declaration. +# See: https://nikitabobko.github.io/AeroSpace/guide#binding-modes +[mode.service.binding] + esc = ['reload-config', 'mode main'] + r = ['flatten-workspace-tree', 'mode main'] # reset layout + f = ['layout floating tiling', 'mode main'] # Toggle between floating and tiling layout + backspace = ['close-all-windows-but-current', 'mode main'] + + # sticky is not yet supported https://github.com/nikitabobko/AeroSpace/issues/2 + #s = ['layout sticky tiling', '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'] + + down = 'volume down' + up = 'volume up' + shift-down = ['volume set 0', 'mode main'] diff --git a/src_files/.config/git/config b/src_files/.config/git/config index 6b115bd..a74b861 100644 --- a/src_files/.config/git/config +++ b/src_files/.config/git/config @@ -2,4 +2,4 @@ defaultBranch = master [user] name = david - email = placeholder + email = david@pinewoods.xyz diff --git a/src_files/.config/skhd/skhdrc b/src_files/.config/skhd/skhdrc index 9f42940..db78c0d 100755 --- a/src_files/.config/skhd/skhdrc +++ b/src_files/.config/skhd/skhdrc @@ -2,48 +2,6 @@ # staring file was at /opt/homebrew/opt/yabai/share/yabai/examples # notes, stacks: https://github.com/koekeishiya/yabai/issues/203#issuecomment-650642142 -########################################################################################## -# key bindings for yabai wm -# general idea: alt navigates (move my view); alt+shift modifies (move/change the window) - -# switch to space (to leave SIP in place, configure these in macos system settings) -# alt - 1 # switch to space 1 -# alt - 2 # switch to space 2 (and similar for other numbers) - -# move focused window to the given space -alt + shift - 1 : yabai -m window --space 1 --focus -alt + shift - 2 : yabai -m window --space 2 --focus -alt + shift - 3 : yabai -m window --space 3 --focus -alt + shift - 4 : yabai -m window --space 4 --focus -alt + shift - 5 : yabai -m window --space 5 --focus -alt + shift - 6 : yabai -m window --space 6 --focus -alt + shift - 7 : yabai -m window --space 7 --focus -alt + shift - 8 : yabai -m window --space 8 --focus -alt + shift - 9 : yabai -m window --space 9 --focus - -# all windows in a space to stack mode (each fullscreen) -alt + shift - s : yabai -m space --layout stack -# all windows in a space to grid mode -alt + shift - g : yabai -m space --layout bsp -# all windows in a space to float mode -alt + shift - f : yabai -m space --layout float -# toggle float on/off for the focused window -alt + shift - F : yabai -m window --toggle float -# balance window sizes -alt + shift - 0 : yabai -m space --balance # TODO: figure out better key option - -# focus on next/previous window -alt - j : yabai -m window --focus \ - $(yabai -m query --spaces --space | jq '.type' | tr -d "\"" | sed "s/stack/stack./" | sed "s/.*[^.]\$//")prev -alt - k : yabai -m window --focus \ - $(yabai -m query --spaces --space | jq '.type' | tr -d "\"" | sed "s/stack/stack./" | sed "s/.*[^.]\$//")next - -# move current window up/down in stack -alt + shift - k : yabai -m window --swap \ - $(yabai -m query --spaces --space | jq '.type' | tr -d "\"" | sed "s/stack/stack./" | sed "s/.*[^.]\$//")next -alt + shift - j : yabai -m window --swap \ - $(yabai -m query --spaces --space | jq '.type' | tr -d "\"" | sed "s/stack/stack./" | sed "s/.*[^.]\$//")prev - ########################################################################################## # key bindings for general use diff --git a/src_files/.config/yabai/yabairc b/src_files/.config/yabai/yabairc deleted file mode 100755 index e8b82e0..0000000 --- a/src_files/.config/yabai/yabairc +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env sh - -# global settings -yabai -m config \ - external_bar off:40:0 \ - menubar_opacity 1.0 \ - mouse_follows_focus off \ - focus_follows_mouse off \ - display_arrangement_order default \ - window_origin_display default \ - window_placement first_child \ - window_insertion_point focused \ - window_zoom_persist on \ - window_shadow off \ - window_animation_duration 0.0 \ - window_animation_easing ease_out_circ \ - window_opacity_duration 0.0 \ - active_window_opacity 1.0 \ - normal_window_opacity 0.90 \ - window_opacity off \ - insert_feedback_color 0xffd75f5f \ - split_ratio 0.0 \ - split_type auto \ - auto_balance off \ - top_padding 00 \ - bottom_padding 00 \ - left_padding 00 \ - right_padding 00 \ - window_gap 00 \ - layout bsp \ - mouse_modifier fn \ - mouse_action1 move \ - mouse_action2 resize \ - mouse_drop_action swap -