diff --git a/home/README.md b/home/README.md index da6aa044..a85503c0 100644 --- a/home/README.md +++ b/home/README.md @@ -30,7 +30,6 @@ home/ │ ├── linux/ # Linux host home modules (ai, shoukei, k3s-*, etc.) │ └── darwin/ # macOS host home modules (fern, frieren) └── darwin/ # macOS-specific home manager configurations - ├── aerospace/ # macOS window manager ├── proxy/ # Proxy configurations └── ... ``` @@ -48,7 +47,7 @@ home/ 3. **darwin**: macOS-specific configuration - macOS applications and services - - Platform-specific integrations (Aerospace, Squirrel, etc.) + - Platform-specific integrations (Squirrel, etc.) 4. **hosts**: Host entry modules for Home Manager - Each output should reference only one host home module file diff --git a/home/darwin/README.md b/home/darwin/README.md index dd26f670..9edc47a2 100644 --- a/home/darwin/README.md +++ b/home/darwin/README.md @@ -11,13 +11,6 @@ This directory contains macOS-specific Home Manager configurations for Darwin sy - **rime-squirrel.nix**: [Rime Squirrel](https://github.com/rime/squirrel) input method configuration -### Window Management - -- **aerospace/**: [Aerospace](https://github.com/nikitabobko/AeroSpace) tiling window manager - configuration - - Custom keybindings and workspace management - - Application-specific window rules - ### Network Configuration - **proxy/**: Network proxy configurations diff --git a/home/darwin/aerospace/aerospace.toml b/home/darwin/aerospace/aerospace.toml deleted file mode 100644 index 56ecd60e..00000000 --- a/home/darwin/aerospace/aerospace.toml +++ /dev/null @@ -1,337 +0,0 @@ -# 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 login to macOS user session. -# 'start-at-login' needs to be 'true' for 'after-login-command' to work -# Available commands: https://nikitabobko.github.io/AeroSpace/commands -after-login-command = [] - -# You can use it to add commands that run after AeroSpace startup. -# 'after-startup-command' is run after 'after-login-command' -# Available commands : https://nikitabobko.github.io/AeroSpace/commands -after-startup-command = [ - # Highlight focused windows with colored borders - # - # JankyBorders has a built-in detection of already running process, - # so it won't be run twice on AeroSpace restart - 'exec-and-forget borders active_color=0xffe1e3e4 inactive_color=0xff494d64 width=5.0', -] - -# Start AeroSpace at login -start-at-login = true - -# 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 = 3 -inner.vertical = 3 -outer.left = 3 -outer.bottom = 3 -outer.top = 3 -outer.right = 3 - -# ['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 "kitty" - 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-shift-minus = 'resize smart -50' -alt-shift-equal = 'resize smart +50' - -# See: https://nikitabobko.github.io/AeroSpace/commands#workspace -alt-1 = 'workspace 1Kitty' -alt-2 = 'workspace 2Alacritty' -alt-3 = 'workspace 3Work' -alt-4 = 'workspace 4Firefox' -alt-5 = 'workspace 5Chrome' -alt-6 = 'workspace 6Chat' -alt-7 = 'workspace 7Work' -alt-8 = 'workspace 8Music' -alt-9 = 'workspace 9File' -alt-0 = 'workspace 0Other' -alt-a = 'workspace A' # In your config, you can drop workspace bindings that you don't need -alt-b = 'workspace B' - - - -# See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace -alt-shift-1 = 'move-node-to-workspace 1Kitty' -alt-shift-2 = 'move-node-to-workspace 2Alacritty' -alt-shift-3 = 'move-node-to-workspace 3Work' -alt-shift-4 = 'move-node-to-workspace 4Firefox' -alt-shift-5 = 'move-node-to-workspace 5Chrome' -alt-shift-6 = 'move-node-to-workspace 6Chat' -alt-shift-7 = 'move-node-to-workspace 7Work' -alt-shift-8 = 'move-node-to-workspace 8Music' -alt-shift-9 = 'move-node-to-workspace 9File' -alt-shift-0 = 'move-node-to-workspace 0Other' -alt-shift-a = 'move-node-to-workspace A' -alt-shift-b = 'move-node-to-workspace B' - - -# 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'] - - -# Declare 'resize' binding mode -[mode.resize.binding] -h = 'resize width -50' -j = 'resize height +50' -k = 'resize height -50' -l = 'resize width +50' -enter = 'mode main' -esc = 'mode main' - -[exec] -inherit-env-vars = true -[exec.env-vars] -PATH = '/opt/homebrew/bin:/opt/homebrew/sbin:${PATH}' - -# ================================================================= -# -# Assign apps on particular workspaces -# -# Use this command to get IDs of running applications: -# aerospace list-apps -# -# ================================================================= - -[[on-window-detected]] -if.app-id = 'net.kovidgoyal.kitty' -run = 'move-node-to-workspace 1Kitty' - -[[on-window-detected]] -if.app-id = 'org.alacritty' -run = 'move-node-to-workspace 2Alacritty' - -[[on-window-detected]] -if.app-id = 'com.tencent.WeWorkMac' -run = 'move-node-to-workspace 3Work' - -[[on-window-detected]] -# if.app-id = 'com.tencent.WeWorkMac' -if.app-id = 'com.tinyspeck.slackmacgap' -run = 'move-node-to-workspace 3Work' - -[[on-window-detected]] -if.app-id = 'org.mozilla.firefox' -run = 'move-node-to-workspace 4Firefox' - -[[on-window-detected]] -if.app-id = 'com.google.Chrome' -run = 'move-node-to-workspace 5Chrome' - -[[on-window-detected]] -if.app-id = 'ru.keepcoder.Telegram' -run = 'move-node-to-workspace 6Chat' - -[[on-window-detected]] -if.app-id = 'com.tencent.xinWeChat' -run = 'move-node-to-workspace 6Chat' - -[[on-window-detected]] -if.app-id = 'com.tencent.qq' -run = 'move-node-to-workspace 6Chat' - -[[on-window-detected]] -if.app-id = 'com.apple.mail' -run = 'move-node-to-workspace 7Work' - -# calendar -[[on-window-detected]] -if.app-id = 'com.apple.iCal' -run = 'move-node-to-workspace 7Work' - -[[on-window-detected]] -if.app-id = 'com.tencent.QQMusicMac' -run = 'move-node-to-workspace 8Music' - -[[on-window-detected]] -if.app-id = 'com.netease.163music' -run = 'move-node-to-workspace 8Music' - -[[on-window-detected]] -if.app-id = 'com.apple.finder' -run = ['layout floating', 'move-node-to-workspace 9File'] - -[[on-window-detected]] -if.app-id = 'com.apple.iBooksX' -run = ['layout floating', 'move-node-to-workspace 9File'] - -[[on-window-detected]] -if.app-id = 'net.cozic.joplin-desktop' -run = ['layout floating', 'move-node-to-workspace 9File'] - -# Book/Picture Preview -[[on-window-detected]] -if.app-id = 'com.apple.Preview' -run = ['layout floating', 'move-node-to-workspace 9File'] - -[[on-window-detected]] -if.app-id = 'com.microsoft.VSCode' -run = ['layout floating', 'move-node-to-workspace 9File'] - -[[on-window-detected]] -if.app-id = 'com.todesktop.230313mzl4w4u92' # Cursor AI Editor -run = ['layout floating', 'move-node-to-workspace 9File'] - -[[on-window-detected]] -if.app-id = 'org.wireshark.Wireshark' -run = ['layout floating', 'move-node-to-workspace 0Other'] - -[[on-window-detected]] -if.app-id = 'ai.elementlabs.lmstudio' -run = ['layout floating', 'move-node-to-workspace 0Other'] - -# Clash Verge - has problem with floating -[[on-window-detected]] -if.app-id = 'io.github.clash-verge-rev.clash-verge-rev' -run = ['move-node-to-workspace 0Other'] - -[[on-window-detected]] -if.app-id = 'us.zoom.xos' -run = 'move-node-to-workspace 0Other' - -# Auth UI - do not move it -[[on-window-detected]] -if.app-id = 'com.apple.SecurityAgent' -run = ['layout floating'] - -# System Settings - do not move it -[[on-window-detected]] -if.app-id = 'com.apple.systempreferences' -run = ['layout floating'] - -# Make all windows float by default -[[on-window-detected]] -check-further-callbacks = true -run = ['layout floating'] - -# ================================================================= -# Multiple monitor configuration -# ================================================================= - -[workspace-to-monitor-force-assignment] -1Kitty = ['main'] # Non-main monitor in case when there are only two monitors' -2Alacritty = ['main'] # "Main" monitor ("main" as in System Settings → Displays → Use as) -3Work = ['built-in'] -4Firefox = ['main'] -5Chrome = ['main'] -6Chat = ['built-in'] -7Work = ['main'] -8Music = ['built-in'] -9File = ['main'] -0Other = ['main'] diff --git a/home/darwin/aerospace/default.nix b/home/darwin/aerospace/default.nix deleted file mode 100644 index dc1fd6be..00000000 --- a/home/darwin/aerospace/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, ... }: -{ - home.file.".aerospace.toml".source = - config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nix-config/home/darwin/aerospace/aerospace.toml"; -} diff --git a/modules/darwin/apps.nix b/modules/darwin/apps.nix index 63399633..c8d8b993 100644 --- a/modules/darwin/apps.nix +++ b/modules/darwin/apps.nix @@ -140,17 +140,12 @@ in "gnu-tar" ]; - taps = [ - "nikitabobko/tap" # aerospace - an i3-like tiling window manager for macOS - ]; - # `brew install --cask` casks = [ "squirrel-app" # input method for Chinese, rime-squirrel "firefox" "google-chrome" - # "nikitabobko/tap/aerospace" # an i3-like tiling window manager for macOS "ghostty" # terminal emulator # code editor