From 63d915439e1fcd47bb9d75a325e7c2f9f68350fc Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Sun, 20 Aug 2023 20:46:28 -0700 Subject: [PATCH] New mac stuff --- .amethyst | 44 +++++------ .doom.d/config.el | 2 +- .gitconfig | 6 +- .gitmodules | 54 ------------- .gnupg/gpg-agent.conf | 2 + .oldvim/vim/bundle/Align | 1 - .oldvim/vim/bundle/FuzzyFinder | 1 - .oldvim/vim/bundle/Gundo | 1 - .oldvim/vim/bundle/L9 | 1 - .oldvim/vim/bundle/ShowMarks | 1 - .oldvim/vim/bundle/Tabular | 1 - .oldvim/vim/bundle/The-NERD-tree | 1 - .oldvim/vim/bundle/YouCompleteMe | 1 - .oldvim/vim/bundle/ag | 1 - .oldvim/vim/bundle/ctrlp.vim | 1 - .oldvim/vim/bundle/gnupg | 1 - .oldvim/vim/bundle/syntastic | 1 - .oldvim/vim/bundle/vim-coffee-script | 1 - .oldvim/vim/bundle/vim-markdown | 1 - .oldvim/vim/bundle/vim-plist | 1 - .oldvim/vim/bundle/vim-puppet | 1 - .oldvim/vim/bundle/vundle | 1 - .skhdrc | 110 +++++++++++++++++---------- .tmux.conf | 2 +- .tmux/plugins/tpm | 2 +- .yabairc | 45 +++++++++++ .zshrc | 7 +- Brewfile | 99 ++++++++++++------------ 28 files changed, 198 insertions(+), 192 deletions(-) delete mode 160000 .oldvim/vim/bundle/Align delete mode 160000 .oldvim/vim/bundle/FuzzyFinder delete mode 160000 .oldvim/vim/bundle/Gundo delete mode 160000 .oldvim/vim/bundle/L9 delete mode 160000 .oldvim/vim/bundle/ShowMarks delete mode 160000 .oldvim/vim/bundle/Tabular delete mode 160000 .oldvim/vim/bundle/The-NERD-tree delete mode 160000 .oldvim/vim/bundle/YouCompleteMe delete mode 160000 .oldvim/vim/bundle/ag delete mode 160000 .oldvim/vim/bundle/ctrlp.vim delete mode 160000 .oldvim/vim/bundle/gnupg delete mode 160000 .oldvim/vim/bundle/syntastic delete mode 160000 .oldvim/vim/bundle/vim-coffee-script delete mode 160000 .oldvim/vim/bundle/vim-markdown delete mode 160000 .oldvim/vim/bundle/vim-plist delete mode 160000 .oldvim/vim/bundle/vim-puppet delete mode 160000 .oldvim/vim/bundle/vundle create mode 100755 .yabairc diff --git a/.amethyst b/.amethyst index a7ed55b..df7fddd 100644 --- a/.amethyst +++ b/.amethyst @@ -1,9 +1,8 @@ { "layouts": [ "tall", - "wide", - "fullscreen", - "column" + "bsp", + "fullscreen" ], "Valid modifiers are": [ "option", @@ -12,13 +11,13 @@ "command" ], "mod1": [ - "option", - "shift" + "control", + "option" ], "mod2": [ + "control", "option", - "shift", - "control" + "shift" ], "screens": 4, "cycle-layout": { @@ -31,19 +30,15 @@ }, "select-tall-layout": { "mod": "mod1", - "key": "a" + "key": "g" }, - "select-wide-layout": { + "select-bsp-layout": { "mod": "mod1", - "key": "s" + "key": "c" }, "select-fullscreen-layout": { "mod": "mod1", - "key": "d" - }, - "select-column-layout": { - "mod": "mod1", - "key": "f" + "key": "r" }, "focus-screen-ccw": { "mod": "mod1", @@ -55,7 +50,7 @@ }, "focus-screen-1": { "mod": "mod1", - "key": "w" + "key": "o" }, "focus-screen-2": { "mod": "mod1", @@ -63,15 +58,15 @@ }, "focus-screen-3": { "mod": "mod1", - "key": "r" + "key": "u" }, "focus-screen-4": { "mod": "mod1", - "key": "q" + "key": "i" }, "throw-screen-1": { "mod": "mod2", - "key": "w" + "key": "o" }, "throw-screen-2": { "mod": "mod2", @@ -79,11 +74,11 @@ }, "throw-screen-3": { "mod": "mod2", - "key": "r" + "key": "u" }, "throw-screen-4": { "mod": "mod2", - "key": "q" + "key": "i" }, "shrink-main": { "mod": "mod1", @@ -183,7 +178,7 @@ }, "toggle-float": { "mod": "mod1", - "key": "t" + "key": "f" }, "toggle-tiling": { "mod": "mod2", @@ -289,12 +284,13 @@ "ignore-menu-bar": false, "use-canary-build": true, "new-windows-to-main": false, - "follow-space-thrown-windows": true, + "follow-space-thrown-windows": false, "send-crash-reports": true, - "screen-padding-top": 0, + "screen-padding-top": 33, "screen-padding-bottom": 0, "screen-padding-left": 0, "screen-padding-right": 0, + "disable-padding-on-builtin-display": true, "debug-layout-info": true, "restore-layouts-on-launch": true } diff --git a/.doom.d/config.el b/.doom.d/config.el index b60600e..c48e4a2 100644 --- a/.doom.d/config.el +++ b/.doom.d/config.el @@ -27,7 +27,7 @@ ;; `load-theme' function. This is the default: ;(setq doom-theme 'doom-one) (setq doom-theme 'doom-nord) -(setq doom-font (font-spec :family "Liberation Mono" :size 14)) +(setq doom-font (font-spec :family "LiterationMono Nerd Font" :size 14)) ;; If you use `org' and don't want your org files in the default location below, ;; change `org-directory'. It must be set before org loads! diff --git a/.gitconfig b/.gitconfig index 16f850c..c6bfd3d 100644 --- a/.gitconfig +++ b/.gitconfig @@ -31,8 +31,10 @@ gpgsign = true [http] cookiefile = ~/.gitcookies -[url "git@github.com:"] - insteadOf = https://github.com/ +#[url "git@github.com:"] +# insteadOf = https://github.com/ +[url "git@git.autodesk.com:"] + insteadOf = https://git.autodesk.com/ [pull] ff = only [init] diff --git a/.gitmodules b/.gitmodules index 249e390..b72d60a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,57 +1,3 @@ -[submodule ".vim/bundle/Gundo"] - path = .oldvim/vim/bundle/Gundo - url = https://github.com/vim-scripts/Gundo.git - ignore = dirty -[submodule ".vim/bundle/ShowMarks"] - path = .oldvim/vim/bundle/ShowMarks - url = https://github.com/vim-scripts/ShowMarks.git - ignore = dirty -[submodule ".vim/bundle/vundle"] - path = .oldvim/vim/bundle/vundle - url = https://github.com/gmarik/vundle.git - ignore = dirty -[submodule ".vim/bundle/Align"] - path = .oldvim/vim/bundle/Align - url = https://github.com/vim-scripts/Align.git -[submodule ".vim/bundle/vim-markdown"] - path = .oldvim/vim/bundle/vim-markdown - url = https://github.com/tpope/vim-markdown.git -[submodule ".vim/bundle/FuzzyFinder"] - path = .oldvim/vim/bundle/FuzzyFinder - url = https://github.com/vim-scripts/FuzzyFinder.git -[submodule ".vim/bundle/L9"] - path = .oldvim/vim/bundle/L9 - url = https://github.com/vim-scripts/L9.git -[submodule ".vim/bundle/Tabular"] - path = .oldvim/vim/bundle/Tabular - url = https://github.com/vim-scripts/Tabular.git -[submodule ".vim/bundle/The-NERD-tree"] - path = .oldvim/vim/bundle/The-NERD-tree - url = https://github.com/vim-scripts/The-NERD-tree.git -[submodule ".vim/bundle/ctrlp.vim"] - path = .oldvim/vim/bundle/ctrlp.vim - url = https://github.com/vim-scripts/ctrlp.vim.git -[submodule ".vim/bundle/gnupg"] - path = .oldvim/vim/bundle/gnupg - url = https://github.com/vim-scripts/gnupg.git -[submodule ".vim/bundle/vim-puppet"] - path = .oldvim/vim/bundle/vim-puppet - url = https://github.com/voxpupuli/vim-puppet.git -[submodule ".vim/bundle/vim-plist"] - path = .oldvim/vim/bundle/vim-plist - url = https://github.com/hunner/vim-plist.git -[submodule ".vim/bundle/vim-coffee-script"] - path = .oldvim/vim/bundle/vim-coffee-script - url = https://github.com/vim-scripts/vim-coffee-script.git -[submodule ".vim/bundle/syntastic"] - path = .oldvim/vim/bundle/syntastic - url = https://github.com/scrooloose/syntastic.git -[submodule ".vim/bundle/YouCompleteMe"] - path = .oldvim/vim/bundle/YouCompleteMe - url = https://github.com/Valloric/YouCompleteMe.git -[submodule ".vim/bundle/ag"] - path = .oldvim/vim/bundle/ag - url = https://github.com/rking/ag.vim [submodule ".tmux/plugins/tpm"] path = .tmux/plugins/tpm url = git@github.com:tmux-plugins/tpm diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf index a1c38a3..6cf1334 100644 --- a/.gnupg/gpg-agent.conf +++ b/.gnupg/gpg-agent.conf @@ -4,4 +4,6 @@ enable-ssh-support #disable-scdaemon #pinentry-program /usr/local/bin/pinentry-mac #pinentry-program /usr/sbin/pinentry-curses +pinentry-program /opt/homebrew/bin/pinentry-mac +#pinentry-program /usr/bin/pinentry-curses #extra-socket /Users/hunner/.gnupg/S.gpg-agent.extra diff --git a/.oldvim/vim/bundle/Align b/.oldvim/vim/bundle/Align deleted file mode 160000 index 787662f..0000000 --- a/.oldvim/vim/bundle/Align +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 787662fe90cd057942bc5b682fd70c87e1a9dd77 diff --git a/.oldvim/vim/bundle/FuzzyFinder b/.oldvim/vim/bundle/FuzzyFinder deleted file mode 160000 index b9f1659..0000000 --- a/.oldvim/vim/bundle/FuzzyFinder +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b9f165970346df55862853dd83c8a4f2b2b70262 diff --git a/.oldvim/vim/bundle/Gundo b/.oldvim/vim/bundle/Gundo deleted file mode 160000 index f443470..0000000 --- a/.oldvim/vim/bundle/Gundo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f443470b96364c24a775629418a6b2562ec9173e diff --git a/.oldvim/vim/bundle/L9 b/.oldvim/vim/bundle/L9 deleted file mode 160000 index c822b05..0000000 --- a/.oldvim/vim/bundle/L9 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c822b05ee0886f9a9703227dc85a6d47612c4bf1 diff --git a/.oldvim/vim/bundle/ShowMarks b/.oldvim/vim/bundle/ShowMarks deleted file mode 160000 index ef22709..0000000 --- a/.oldvim/vim/bundle/ShowMarks +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ef22709d8ebba137819ab0e60db5463b480934cd diff --git a/.oldvim/vim/bundle/Tabular b/.oldvim/vim/bundle/Tabular deleted file mode 160000 index 4c3eafd..0000000 --- a/.oldvim/vim/bundle/Tabular +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4c3eafd97f0c0199a8630fb77c2160c58142d524 diff --git a/.oldvim/vim/bundle/The-NERD-tree b/.oldvim/vim/bundle/The-NERD-tree deleted file mode 160000 index af65bd2..0000000 --- a/.oldvim/vim/bundle/The-NERD-tree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit af65bd23e69a3a5fc1a39eb47733191b7110bb1e diff --git a/.oldvim/vim/bundle/YouCompleteMe b/.oldvim/vim/bundle/YouCompleteMe deleted file mode 160000 index 8ad4044..0000000 --- a/.oldvim/vim/bundle/YouCompleteMe +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8ad4044203b9f0a64f238445734fb874936fdc80 diff --git a/.oldvim/vim/bundle/ag b/.oldvim/vim/bundle/ag deleted file mode 160000 index 994c27d..0000000 --- a/.oldvim/vim/bundle/ag +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 994c27dd8f237573208548e7480e39b24ccbbfba diff --git a/.oldvim/vim/bundle/ctrlp.vim b/.oldvim/vim/bundle/ctrlp.vim deleted file mode 160000 index bd07a75..0000000 --- a/.oldvim/vim/bundle/ctrlp.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bd07a75d05d2dc47b670cb7d925fef38322d1e19 diff --git a/.oldvim/vim/bundle/gnupg b/.oldvim/vim/bundle/gnupg deleted file mode 160000 index 3293c58..0000000 --- a/.oldvim/vim/bundle/gnupg +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3293c5870fabb3c1775618cedf0684e4a0cc4ab8 diff --git a/.oldvim/vim/bundle/syntastic b/.oldvim/vim/bundle/syntastic deleted file mode 160000 index c3882ef..0000000 --- a/.oldvim/vim/bundle/syntastic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c3882ef5b087427e5c2e2f5fbe8f268ee02a2f3a diff --git a/.oldvim/vim/bundle/vim-coffee-script b/.oldvim/vim/bundle/vim-coffee-script deleted file mode 160000 index 0d2bd48..0000000 --- a/.oldvim/vim/bundle/vim-coffee-script +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0d2bd483283346629cb8e34822114276792f4fa9 diff --git a/.oldvim/vim/bundle/vim-markdown b/.oldvim/vim/bundle/vim-markdown deleted file mode 160000 index ee550a7..0000000 --- a/.oldvim/vim/bundle/vim-markdown +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ee550a7b2b47010fda7e5568dbffebd986ead080 diff --git a/.oldvim/vim/bundle/vim-plist b/.oldvim/vim/bundle/vim-plist deleted file mode 160000 index 0c834e5..0000000 --- a/.oldvim/vim/bundle/vim-plist +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0c834e58e81db2e2209d9df8e22c8a67772f2b3d diff --git a/.oldvim/vim/bundle/vim-puppet b/.oldvim/vim/bundle/vim-puppet deleted file mode 160000 index ad63ab0..0000000 --- a/.oldvim/vim/bundle/vim-puppet +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ad63ab013f1aa9d00057fe166f45d12855b124b8 diff --git a/.oldvim/vim/bundle/vundle b/.oldvim/vim/bundle/vundle deleted file mode 160000 index 5f70ae6..0000000 --- a/.oldvim/vim/bundle/vundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5f70ae6025e951f0154e3940d123138adffa4c88 diff --git a/.skhdrc b/.skhdrc index 1dd7629..b56b619 100644 --- a/.skhdrc +++ b/.skhdrc @@ -287,7 +287,8 @@ switcher < i ; info #cmd - return : osascript /Users/hunner/local/bin/terminal.scpt #cmd - return : /Applications/Kitty.app/Contents/MacOS/kitty --single-instance -d ~ -cmd - return : osascript /Users/hunner/local/bin/iterm_window.scpt +#cmd - return : osascript /Users/hunner/local/bin/iterm_window.scpt +cmd + shift - return : ~/local/bin/open_iterm.sh cmd + ctrl + alt - 9 : osascript /Users/hunner/local/bin/grayscale.scpt cmd + alt - h : yabai -m window --focus west @@ -295,49 +296,67 @@ cmd + alt - j : yabai -m window --focus south cmd + alt - k : yabai -m window --focus north cmd + alt - l : yabai -m window --focus east -ctrl - 1 : yabai -m space --focus 1 -ctrl - 2 : yabai -m space --focus 2 -ctrl - 3 : yabai -m space --focus 3 -ctrl - 4 : yabai -m space --focus 4 -ctrl - 5 : yabai -m space --focus 5 -ctrl - 6 : yabai -m space --focus 6 -ctrl - 7 : yabai -m space --focus 7 -ctrl - 8 : yabai -m space --focus 8 -ctrl - 9 : yabai -m space --focus 9 -ctrl - 0 : yabai -m space --focus 10 -ctrl + alt - 1 : yabai -m space --focus 11 -ctrl + alt - 2 : yabai -m space --focus 12 -ctrl + alt - 3 : yabai -m space --focus 13 -ctrl + alt - 4 : yabai -m space --focus 14 -ctrl + alt - 5 : yabai -m space --focus 15 -ctrl + alt - 6 : yabai -m space --focus 16 +cmd + alt + shift - h : yabai -m window --warp west +cmd + alt + shift - j : yabai -m window --warp south +cmd + alt + shift - k : yabai -m window --warp north +cmd + alt + shift - l : yabai -m window --warp east -ctrl + shift - 1 : yabai -m window --space 1 -ctrl + shift - 2 : yabai -m window --space 2 -ctrl + shift - 3 : yabai -m window --space 3 -ctrl + shift - 4 : yabai -m window --space 4 -ctrl + shift - 5 : yabai -m window --space 5 -ctrl + shift - 6 : yabai -m window --space 6 -ctrl + shift - 7 : yabai -m window --space 7 -ctrl + shift - 8 : yabai -m window --space 8 -ctrl + shift - 9 : yabai -m window --space 9 -ctrl + shift - 0 : yabai -m window --space 10 -ctrl + shift + alt - 1 : yabai -m window --space 11 -ctrl + shift + alt - 2 : yabai -m window --space 12 -ctrl + shift + alt - 3 : yabai -m window --space 13 -ctrl + shift + alt - 4 : yabai -m window --space 14 -ctrl + shift + alt - 5 : yabai -m window --space 15 -ctrl + shift + alt - 6 : yabai -m window --space 16 +cmd + alt - 1 : yabai -m space --focus 1 +cmd + alt - 2 : yabai -m space --focus 2 +cmd + alt - 3 : yabai -m space --focus 3 +cmd + alt - 4 : yabai -m space --focus 4 +cmd + alt - 5 : yabai -m space --focus 5 +cmd + alt - 6 : yabai -m space --focus 6 +cmd + alt - 7 : yabai -m space --focus 7 +cmd + alt - 8 : yabai -m space --focus 8 +cmd + alt - 9 : yabai -m space --focus 9 +cmd + alt - 0 : yabai -m space --focus 10 + +cmd + alt + shift - 1 : yabai -m window --space 1 +cmd + alt + shift - 2 : yabai -m window --space 2 +cmd + alt + shift - 3 : yabai -m window --space 3 +cmd + alt + shift - 4 : yabai -m window --space 4 +cmd + alt + shift - 5 : yabai -m window --space 5 +cmd + alt + shift - 6 : yabai -m window --space 6 +cmd + alt + shift - 7 : yabai -m window --space 7 +cmd + alt + shift - 8 : yabai -m window --space 8 +cmd + alt + shift - 9 : yabai -m window --space 9 +cmd + alt + shift - 0 : yabai -m window --space 10 # Focus display -switcher < 1 : yabai -m display --focus 1 #; khd -e "mode activate default" -switcher < 2 : yabai -m display --focus 2 #; khd -e "mode activate default" -switcher < 3 : yabai -m display --focus 3 #; khd -e "mode activate default" +cmd + alt - o : yabai -m display --focus 2 +cmd + alt - e : yabai -m display --focus 1 +cmd + alt - u : yabai -m display --focus 3 # Move window to display -move < shift - 1 : yabai -m window --display 1 #; khd -e "mode activate default" -move < shift - 2 : yabai -m window --display 2 #; khd -e "mode activate default" -move < shift - 3 : yabai -m window --display 3 #; khd -e "mode activate default" +cmd + alt + shift - o : yabai -m window --display 2 +cmd + alt + shift - e : yabai -m window --display 1 +cmd + alt + shift - u : yabai -m window --display 3 + +# Move space to display +cmd + alt + shift + ctrl - o : yabai -m space --display 2 +cmd + alt + shift + ctrl - e : yabai -m space --display 1 +cmd + alt + shift + ctrl - u : yabai -m space --display 3 + +# Focus spaces +cmd + alt - left : yabai -m space --focus prev +cmd + alt - right : yabai -m space --focus next + +# Swap spaces +cmd + alt + shift - 1 : yabai -m space --focus 1; yabai -m space --swap 1 +cmd + alt + shift - 2 : yabai -m space --focus 2; yabai -m space --swap 2 +cmd + alt + shift - 3 : yabai -m space --focus 3; yabai -m space --swap 3 +cmd + alt + shift - 4 : yabai -m space --focus 4; yabai -m space --swap 4 +cmd + alt + shift - 5 : yabai -m space --focus 5; yabai -m space --swap 5 +cmd + alt + shift - 6 : yabai -m space --focus 6; yabai -m space --swap 6 +cmd + alt + shift - 7 : yabai -m space --focus 7; yabai -m space --swap 7 +cmd + alt + shift - 8 : yabai -m space --focus 8; yabai -m space --swap 8 +cmd + alt + shift - 9 : yabai -m space --focus 9; yabai -m space --swap 9 +cmd + alt + shift - 0 : yabai -m space --focus 10; yabai -m space --swap 10 + +# Reorder spaces +cmd + alt + shift - left : yabai -m space --move prev +cmd + alt + shift - right : yabai -m space --move next ## ytd mode #ytd - x : ytc play;\ @@ -398,6 +417,19 @@ spacey < shift - g : yabai -m space --gap dec # toggle padding and gap spacey < shift - a : yabai -m space --toggle padding; yabai -m space --toggle gap +# from https://anuj-chandra.medium.com/using-i3-like-tiling-window-managers-in-macos-with-yabai-ebf0e002b992 +cmd + alt - space : yabai -m space --layout "$(yabai -m query --spaces --space | jq -r 'if .type == "bsp" then "stack" else "bsp" end')" + +# forward +cmd + alt - up : yabai -m query --windows --space \ + | jq -sre 'add | map(select(.minimized != 1)) | sort_by(.display, .frame.y, .frame.x, .id) | reverse | nth(index(map(select(."has-focus"))) - 1).id' \ + | xargs -I{} yabai -m window --focus {} + +# backward +cmd + alt - down: yabai -m query --windows --space \ + | jq -sre 'add | map(select(.minimized != 1)) | sort_by(.display, .frame.y, .frame.y, .id) | nth(index(map(select(."has-focus"))) - 1).id' \ + | xargs -I{} yabai -m window --focus {} + #spacey < shift - x : kwmc spacey -g decrease horizontal #spacey < shift - y : kwmc spacey -g decrease vertical diff --git a/.tmux.conf b/.tmux.conf index 11a0567..e22cd83 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -1,7 +1,7 @@ ### List of plugins set -g @plugin "tmux-plugins/tpm" set -g @plugin "tmux-plugins/tmux-sensible" -set -g @plugin "arcticicestudio/nord-tmux" +set -g @plugin "nordtheme/tmux" set -g @plugin "tmux-plugins/tmux-prefix-highlight" ### screen-like keybindings diff --git a/.tmux/plugins/tpm b/.tmux/plugins/tpm index 2afeff1..99469c4 160000 --- a/.tmux/plugins/tpm +++ b/.tmux/plugins/tpm @@ -1 +1 @@ -Subproject commit 2afeff1529ec85d0c5ced5ece3714c2220b646a5 +Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946 diff --git a/.yabairc b/.yabairc new file mode 100755 index 0000000..a36802d --- /dev/null +++ b/.yabairc @@ -0,0 +1,45 @@ +yabai -m signal --add event=dock_did_restart action="sudo yabai --load-sa" +sudo yabai --load-sa + +# bsp or float (default: float) +yabai -m config layout bsp + +# set mouse interaction modifier key (default: fn) +yabai -m config mouse_modifier fn +# set modifier + left-click drag to move window (default: move) +yabai -m config mouse_action1 move +# set modifier + right-click drag to resize window (default: resize) +yabai -m config mouse_action2 resize +# set focus follows mouse mode (default: off, options: off, autoraise, autofocus) +yabai -m config focus_follows_mouse autoraise +# set mouse follows focus mode (default: off) +yabai -m config mouse_follows_focus off + +# modify window shadows (default: on, options: on, off, float) +# example: show shadows only for floating windows +yabai -m config window_shadow float + +# window opacity (default: off) +# example: render all unfocused windows with 90% opacity +yabai -m config window_opacity on +yabai -m config active_window_opacity 1.0 +yabai -m config normal_window_opacity 0.9 + +yabai -m space 1 --label work +yabai -m space 2 --label zoom +yabai -m space 3 --label mail +yabai -m space 5 --label rdp +yabai -m space 7 --label slack +yabai -m space 8 --label emacs +yabai -m space 9 --label music + +yabai -m config window_border on +yabai -m config window_border_width 1 +yabai -m config active_window_border_color 0xff775759 + +yabai -m config external_bar all:33:0 +yabai -m config top_padding 1 [master][10:03] +yabai -m config bottom_padding 1 +yabai -m config left_padding 1 +yabai -m config right_padding 1 +yabai -m config window_gap 1 diff --git a/.zshrc b/.zshrc index 19ddc57..c016c34 100644 --- a/.zshrc +++ b/.zshrc @@ -56,7 +56,7 @@ esac export PATH=/usr/sbin:/usr/bin:/sbin:/bin export MANPATH=~/local/share/man:/usr/man:/usr/share/man:/usr/local/share/man #paths=(/cat/bin) -prepaths=(/opt/puppetlabs/pdk/bin ~/.emacs.d/bin /usr/local/bin /usr/local/sbin /usr/local/opt/node@8/bin ~/.local/bin ~/.rbenv/bin ~/local/talon ~/local/bin ~/local/sbin) +prepaths=(/opt/puppetlabs/pdk/bin ~/.emacs.d/bin /opt/homebrew/bin /usr/local/bin /usr/local/sbin /usr/local/opt/node@8/bin ~/.local/bin ~/.rbenv/bin ~/local/talon ~/local/bin ~/local/sbin) #for dir in $paths ; do # if [ -d $dir ] ; then # export PATH=$PATH:$dir @@ -114,7 +114,8 @@ if [ -f ~/.zsh/private ] ; then fi export NETHACKOPTIONS='autopickup,color,!cmdassist,!number_pad,hilite_pet,boulder:0,pickup_types:$"=/!?+,menustyle:partial,!legacy,suppress_alert:3.3.1' export DEV_ROOT="$HOME/Documents/work/git/" -[ -e /usr/libexec/java_home ] && export JAVA_HOME=$(/usr/libexec/java_home) +# This causes messages on every start without java installed +#[ -e /usr/libexec/java_home ] && export JAVA_HOME=$(/usr/libexec/java_home) export OVFTOOL='/Applications/VMware OVF Tool/ovftool' #export DOCKER_HOST='tcp://192.168.99.100:2375' if whence rg > /dev/null ; then @@ -321,6 +322,8 @@ fi # The next line updates PATH for the Google Cloud SDK. if [ -f '/home/hunner/Downloads/google-cloud-sdk/path.zsh.inc' ]; then . '/home/hunner/Downloads/google-cloud-sdk/path.zsh.inc'; fi +eval "$(/opt/homebrew/bin/brew shellenv)" + # For 1.25 gke auth update export USE_GKE_GCLOUD_AUTH_PLUGIN=True # The next line enables shell command completion for gcloud. diff --git a/Brewfile b/Brewfile index 3275648..3bf3021 100644 --- a/Brewfile +++ b/Brewfile @@ -1,11 +1,10 @@ # Work fun -tap "d12frosted/emacs-plus" ; brew "emacs-plus" -cask "blue-jeans" # Need /usr/local/Caskroom/blue-jeans/2.7.0.450/BlueJeansInstaller.app -cask "docker" # docker docker -cask "slack" # Work/fun chat -cask "tunnelblick" # Work vpn +#tap "d12frosted/emacs-plus" ; brew "emacs-plus" +#cask "docker" # docker docker +brew "podman" # yeah +cask "podman-desktop" # manages the podman status +brew "podman-compose" # not docker compose cask "virtualbox" # vms - reboot and approve kernel extension -cask "vagrant" # all the vms brew "git" # Newer than what brew installs brew "gnupg" # Crypto, not currency brew "pinentry-mac" # gpg card pin entry @@ -15,76 +14,74 @@ brew "ncdu" # Find big files brew "neovim" # Edit stuff. Then `curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim` brew "ripgrep" # Faster grep/ack/ag brew "socat" # Better netcat -cask "iterm2" # Terminal emulator -cask "serial" # Serial terminal emulator +#cask "iterm2" # Terminal emulator brew "tmux" # Terminal thingy brew "reattach-to-user-namespace" # For tmux brew "unrar" # Rar happens brew "unzip" # Zip happens brew "nmap" # Port scanner brew "p0f" # Passive scanner -cask "minikube" # k8s in a box -brew "node@8" # LTS major version; 10 after oct 2018 -brew "yarn" # node stuff -brew "stow" # node stuff? -brew "hugo" # node stuff? -tap "homebrew/cask-versions" # For FF Nightly and java8 -cask "java8" # jdk 8 -cask "intellij-idea" # java dev -cask "jetbrains-toolbox" # other dev tools -brew "maven" # java package management +tap "homebrew/cask-versions" # For FF dev +#cask "jetbrains-toolbox" # other dev tools #cask "visual-studio-code" # frontend dev -brew "pyenv" # rbenv for py -brew "pyenv-virtualenv" # rbenv for pyenv? -cask "google-cloud-sdk" #gcloud suite +brew "cmake" # always useful, but what was it for? brew "bat" # better cat -brew "emacs-mac" # doom-emacs -cask "talon" # voice control +brew "fzf" # better shell search +brew "dua" # better du +brew "fd" # better find +brew "jq" # tooling +brew "fontconfig" # for doom-emacs +brew "shellcheck" # for doom-emacs +brew "discount" # for doom-emacs +#brew tap railwaycat/emacsmacport ; brew install "emacs-mac@28" --with-native-comp --with-modules # doom-emacs +#cask "talon" # voice control # Mac fun -cask "aerial" # Screensaver +#cask "aerial" # Screensaver cask "alfred" # Launcher #tap "koekeishiya/formulae" ; brew "chunkwm" # Window manager #brew "skhd" # Keyboard shortcuts cask "amethyst" # combination window manager and keyboard shortcus -cask "cathode" # Silly terminal +brew "sketchybar" # status bar that works well with amethyst +#cask "cathode" # Silly terminal cask "ubersicht" # UI bar tap "homebrew/cask-fonts" # For fonts -cask "font-hack" # I don't think I use this any more -cask "font-liberation-mono-for-powerline" # For neovim +#cask "font-hack" # I don't think I use this any more +#cask "font-liberation-mono-for-powerline" # For neovim +cask "font-liberation-nerd-font" # for everything +cask "font-jetbrains-nerd-font" # might I like this more? # Game fun -cask "angband" # Morgoth -cask "brogue" # Less goth -cask "steam" # Meta game -cask "itch" # meta indy game -brew "cataclysm" # zombie game +#cask "angband" # Morgoth +#cask "brogue" # Less goth +#cask "steam" # Meta game +#cask "itch" # meta indy game +#brew "cataclysm" # zombie game # Life fun cask "1password" # Family accounts -cask "adobe-creative-cloud" # Family pictures. Run /usr/local/Caskroom/adobe-creative-cloud/latest/Creative Cloud Installer.app -cask "microsoft-office" # OneNote, word, outlook, etc. -brew "ddrescue" # Photo recover -brew "exiftool" # Photo munge -brew "imagemagick" # manipulation +#cask "adobe-creative-cloud" # Family pictures. Run /usr/local/Caskroom/adobe-creative-cloud/latest/Creative Cloud Installer.app +#cask "microsoft-office" # OneNote, word, outlook, etc. +#brew "ddrescue" # Photo recover +#brew "exiftool" # Photo munge +#brew "imagemagick" # manipulation cask "arq" # Family backups -cask "discord" # Friend chat +#cask "discord" # Friend chat cask "dropbox" # File sync cask "onedrive" # File sync -cask "little-snitch" # Personal egress filtering -cask "vlc" # Music videos -brew "youtube-dl" # Music videos -brew "ffmpeg" # better music videos -brew "handbrake" # dvds? -brew "libdvdcss" # dvds!? -cask "makemkv" # mkvs? +#cask "little-snitch" # Personal egress filtering +#cask "vlc" # Music videos +#brew "ffmpeg" # better music videos +#brew "handbrake" # dvds? +#brew "libdvdcss" # dvds!? +#cask "makemkv" # mkvs? # gem install video_transcoding # mkvs!? -cask "zerotier-one" # Personal network - reboot and approve kernel extension +#cask "zerotier-one" # Personal network - reboot and approve kernel extension # Browsers -cask "brave" # For bt -cask "firefox" # Personal browsing -cask "firefox-nightly" # Work browsing +#cask "brave" # For bt +#cask "firefox" # Personal browsing +#cask "firefox-nightly" # Work browsing cask "choosy" # Browser choosing -cask "multifirefox" # Profile manager -cask "google-chrome" # Flash/music +#cask "multifirefox" # Profile manager +#cask "google-chrome" # Flash/music