diff options
author | jjanzen <jjanzen@jjanzen.ca> | 2025-01-07 22:46:21 -0600 |
---|---|---|
committer | jjanzen <jjanzen@jjanzen.ca> | 2025-01-07 22:46:21 -0600 |
commit | f661251a7f107387b60b23a61049660b5cfd5fe2 (patch) | |
tree | e168b6b1d3f8d7c17bdf585903cfa0c2c974fac9 | |
parent | 55e56dbf7793d657da71dc93fbbbf447f1c04447 (diff) |
system changes
-rw-r--r-- | macos.local/.flake/system/core.nix.org | 2 | ||||
-rw-r--r-- | macos.local/.flake/system/skhd.nix.org | 97 | ||||
-rw-r--r-- | macos.local/.flake/system/yabai.nix.org | 61 |
3 files changed, 1 insertions, 159 deletions
diff --git a/macos.local/.flake/system/core.nix.org b/macos.local/.flake/system/core.nix.org index 27f3704..94c49d5 100644 --- a/macos.local/.flake/system/core.nix.org +++ b/macos.local/.flake/system/core.nix.org @@ -18,8 +18,8 @@ Import submodules. #+begin_src nix in { imports = [ - ./homebrew.nix ./aerospace.nix + ./homebrew.nix ]; #+end_src diff --git a/macos.local/.flake/system/skhd.nix.org b/macos.local/.flake/system/skhd.nix.org deleted file mode 100644 index ff7237b..0000000 --- a/macos.local/.flake/system/skhd.nix.org +++ /dev/null @@ -1,97 +0,0 @@ -#+title: SKHD Configuration - -I use =skhd= to configure keyboard bindings. -#+begin_src nix - { config, pkgs, ... }: - - { - services.skhd = { - enable = true; - skhdConfig = '' -#+end_src - -Use =⌘-Enter= to open my terminal. -#+begin_src text - cmd - return : open -n /Applications/Ghostty.app -#+end_src - -Close a window with =⌘-Shift-Q= to close a window. -#+begin_src text - cmd + shift - q : yabai -m window --close -#+end_src - -Launch an application with =⌘-D=. -#+begin_src text - cmd - d : ~/.local/bin/launcher -#+end_src - -Reload the configuration with =⌘-Shift-C=. -#+begin_src text - cmd + shift - c : yabai --restart-service && skhd --restart-service -#+end_src - -Move focus with =⌘-[HJKL]= to move left (H), down (J), up (K), or right (L). -#+begin_src text - cmd - h : yabai -m window --focus west || yabai -m display --focus west - cmd - j : yabai -m window --focus south || yabai -m display --focus south - cmd - k : yabai -m window --focus north || yabai -m display --focus north - cmd - l : yabai -m window --focus east || yabai -m display --focus east -#+end_src - -Move window with =⌘-Shift-[HJKL]= to move left (H), down (J), up (K), or right (L). -#+begin_src text - shift + cmd - h : yabai -m window --warp west - shift + cmd - j : yabai -m window --warp south - shift + cmd - k : yabai -m window --warp north - shift + cmd - l : yabai -m window --warp east -#+end_src - -Move to space =x= with =⌘-x=. -#+begin_src text - cmd - 1 : yabai -m space --focus 1 - cmd - 2 : yabai -m space --focus 2 - cmd - 3 : yabai -m space --focus 3 - cmd - 4 : yabai -m space --focus 4 - cmd - 5 : yabai -m space --focus 5 - cmd - 6 : yabai -m space --focus 6 - cmd - 7 : yabai -m space --focus 7 - cmd - 8 : yabai -m space --focus 8 - cmd - 9 : yabai -m space --focus 9 - cmd - 0 : yabai -m space --focus 10 -#+end_src - -Move application to space =x= with =⌘-=Shift-x=. -#+begin_src text - cmd + shift - 1 : yabai -m window --space 1 - cmd + shift - 2 : yabai -m window --space 2 - cmd + shift - 3 : yabai -m window --space 3 - cmd + shift - 4 : yabai -m window --space 4 - cmd + shift - 5 : yabai -m window --space 5 - cmd + shift - 6 : yabai -m window --space 6 - cmd + shift - 7 : yabai -m window --space 7 - cmd + shift - 8 : yabai -m window --space 8 - cmd + shift - 9 : yabai -m window --space 9 - cmd + shift - 0 : yabai -m window --space 10 -#+end_src - -Toggle fullscreen with =⌘-Shift-F=. -#+begin_src text - cmd + shift - f : yabai -m window --toggle zoom-fullscreen -#+end_src - -Toggle floating with =⌘-Shift-Space=. -#+begin_src text - cmd + shift - space : yabai -m window --toggle float -#+end_src - -Take a screenshot with =⌘-Shift-S=. -#+begin_src text - cmd + shift - s : open /System/Applications/Utilities/Screenshot.app -#+end_src - -Close the block. -#+begin_src nix - ''; - }; - } -#+end_src diff --git a/macos.local/.flake/system/yabai.nix.org b/macos.local/.flake/system/yabai.nix.org deleted file mode 100644 index 1c70dcc..0000000 --- a/macos.local/.flake/system/yabai.nix.org +++ /dev/null @@ -1,61 +0,0 @@ -#+title: Yabai Configuration - -#+begin_src nix - { config, pkgs, ... }: - - { - services.yabai = { - enable = true; -#+end_src - -Use scripting addition features. -#+begin_src nix - enableScriptingAddition = true; - config = { -#+end_src - -Use auto-tiling. -#+begin_src nix - layout = "bsp"; - auto_balance = "on"; -#+end_src - -Do not use padding between windows. -#+begin_src nix - top_padding = 0; - bottom_padding = 0; - left_padding = 0; - right_padding = 0; - window_gap = 0; -#+end_src - -Disable window shadows unless the application is floating. -#+begin_src nix - window_shadow = "float"; -#+end_src - -Mouse moves to focused window and windows are focused on mouse hover. -#+begin_src nix - focus_follows_mouse = "autoraise"; - mouse_follows_focus = "on"; -#+end_src - -Use =⌘= with the mouse to move and resize. -#+begin_src nix - mouse_modifier = "cmd"; - mouse_action1 = "move"; - mouse_action2 = "resize"; - mouse_drop_action = "swap"; -#+end_src - -Add exceptions for some apps. -#+begin_src nix - }; - extraConfig = '' - yabai -m rule --add app="^System Settings$" manage=off - yabai -m rule --add app="^Calculator$" manage=off - yabai -m rule --add app="^mpv" manage=off - ''; - }; - } -#+end_src |