diff --git a/bettermouse-export/bm_cfg_6830.plist b/bettermouse-export/bm_cfg_6830.plist new file mode 100644 index 0000000..c431915 Binary files /dev/null and b/bettermouse-export/bm_cfg_6830.plist differ diff --git a/fish/config.fish b/fish/config.fish index e58d97f..00646df 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -17,14 +17,16 @@ abbr x86 "arch -x86_64" abbr v "nvim" abbr p "pnpm" abbr pd "pnpm dev" +abbr px "pnpm dlx" abbr lg "lazygit" abbr ns "npm start" abbr nrs "npm run serve" abbr nrd "npm run dev" abbr nrw "npm run watch" -abbr venv "source venv/bin/activate.fish" +abbr venv "source .venv/bin/activate.fish" abbr lrr "source venv/bin/activate.fish && litestar run --reload" abbr gw "gow -e=go,mod,html run ." +abbr mw "make watch" abbr nobrew "HOMEBREW_NO_AUTO_UPDATE=1 brew" abbr ghv "gh repo view --web" abbr pr "gh pr checkout" @@ -90,3 +92,7 @@ end # Initialize pyenv pyenv init - | source + +# bun +set --export BUN_INSTALL "$HOME/.bun" +set --export PATH $BUN_INSTALL/bin $PATH diff --git a/git/attributes b/git/attributes new file mode 100644 index 0000000..cbc003c --- /dev/null +++ b/git/attributes @@ -0,0 +1,4 @@ + +*.ipynb diff=jupyternotebook + +*.ipynb merge=jupyternotebook diff --git a/git/config b/git/config index a7065ec..6734087 100644 --- a/git/config +++ b/git/config @@ -8,3 +8,18 @@ defaultBranch = main [pull] rebase = false +[diff "jupyternotebook"] + command = git-nbdiffdriver diff +[merge "jupyternotebook"] + driver = git-nbmergedriver merge %O %A %B %L %P + name = jupyter notebook merge driver +[difftool "nbdime"] + cmd = git-nbdifftool diff \"$LOCAL\" \"$REMOTE\" \"$BASE\" +[difftool] + prompt = false +[mergetool "nbdime"] + cmd = git-nbmergetool merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" +[mergetool] + prompt = false +[alias] + yield = !git pull --rebase --autostash && git push diff --git a/iterm2-preferences/com.googlecode.iterm2.plist b/iterm2-preferences/com.googlecode.iterm2.plist index 549102c..fa96ad9 100644 --- a/iterm2-preferences/com.googlecode.iterm2.plist +++ b/iterm2-preferences/com.googlecode.iterm2.plist @@ -705,6 +705,32 @@ Red Component 0.28627450980392155 + Ansi 0 Color (Dark) + + Alpha Component + 1 + Blue Component + 0.39215686274509803 + Color Space + sRGB + Green Component + 0.30196078431372547 + Red Component + 0.28627450980392155 + + Ansi 0 Color (Light) + + Alpha Component + 1 + Blue Component + 0.39215686274509803 + Color Space + sRGB + Green Component + 0.30196078431372547 + Red Component + 0.28627450980392155 + Ansi 1 Color Alpha Component @@ -718,6 +744,32 @@ Red Component 0.92941176470588238 + Ansi 1 Color (Dark) + + Alpha Component + 1 + Blue Component + 0.58823529411764708 + Color Space + sRGB + Green Component + 0.52941176470588236 + Red Component + 0.92941176470588238 + + Ansi 1 Color (Light) + + Alpha Component + 1 + Blue Component + 0.58823529411764708 + Color Space + sRGB + Green Component + 0.52941176470588236 + Red Component + 0.92941176470588238 + Ansi 10 Color Alpha Component @@ -731,6 +783,32 @@ Red Component 0.65098039215686276 + Ansi 10 Color (Dark) + + Alpha Component + 1 + Blue Component + 0.58431372549019611 + Color Space + sRGB + Green Component + 0.85490196078431369 + Red Component + 0.65098039215686276 + + Ansi 10 Color (Light) + + Alpha Component + 1 + Blue Component + 0.58431372549019611 + Color Space + sRGB + Green Component + 0.85490196078431369 + Red Component + 0.65098039215686276 + Ansi 11 Color Alpha Component @@ -744,6 +822,32 @@ Red Component 0.93333333333333335 + Ansi 11 Color (Dark) + + Alpha Component + 1 + Blue Component + 0.62352941176470589 + Color Space + sRGB + Green Component + 0.83137254901960789 + Red Component + 0.93333333333333335 + + Ansi 11 Color (Light) + + Alpha Component + 1 + Blue Component + 0.62352941176470589 + Color Space + sRGB + Green Component + 0.83137254901960789 + Red Component + 0.93333333333333335 + Ansi 12 Color Alpha Component @@ -757,6 +861,32 @@ Red Component 0.54117647058823526 + Ansi 12 Color (Dark) + + Alpha Component + 1 + Blue Component + 0.95686274509803926 + Color Space + sRGB + Green Component + 0.67843137254901964 + Red Component + 0.54117647058823526 + + Ansi 12 Color (Light) + + Alpha Component + 1 + Blue Component + 0.95686274509803926 + Color Space + sRGB + Green Component + 0.67843137254901964 + Red Component + 0.54117647058823526 + Ansi 13 Color Alpha Component @@ -770,6 +900,32 @@ Red Component 0.96078431372549022 + Ansi 13 Color (Dark) + + Alpha Component + 1 + Blue Component + 0.90196078431372551 + Color Space + sRGB + Green Component + 0.74117647058823533 + Red Component + 0.96078431372549022 + + Ansi 13 Color (Light) + + Alpha Component + 1 + Blue Component + 0.90196078431372551 + Color Space + sRGB + Green Component + 0.74117647058823533 + Red Component + 0.96078431372549022 + Ansi 14 Color Alpha Component @@ -783,6 +939,32 @@ Red Component 0.54509803921568623 + Ansi 14 Color (Dark) + + Alpha Component + 1 + Blue Component + 0.792156862745098 + Color Space + sRGB + Green Component + 0.83529411764705885 + Red Component + 0.54509803921568623 + + Ansi 14 Color (Light) + + Alpha Component + 1 + Blue Component + 0.792156862745098 + Color Space + sRGB + Green Component + 0.83529411764705885 + Red Component + 0.54509803921568623 + Ansi 15 Color Alpha Component @@ -796,6 +978,32 @@ Red Component 0.6470588235294118 + Ansi 15 Color (Dark) + + Alpha Component + 1 + Blue Component + 0.79607843137254897 + Color Space + sRGB + Green Component + 0.67843137254901964 + Red Component + 0.6470588235294118 + + Ansi 15 Color (Light) + + Alpha Component + 1 + Blue Component + 0.79607843137254897 + Color Space + sRGB + Green Component + 0.67843137254901964 + Red Component + 0.6470588235294118 + Ansi 2 Color Alpha Component @@ -809,6 +1017,32 @@ Red Component 0.65098039215686276 + Ansi 2 Color (Dark) + + Alpha Component + 1 + Blue Component + 0.58431372549019611 + Color Space + sRGB + Green Component + 0.85490196078431369 + Red Component + 0.65098039215686276 + + Ansi 2 Color (Light) + + Alpha Component + 1 + Blue Component + 0.58431372549019611 + Color Space + sRGB + Green Component + 0.85490196078431369 + Red Component + 0.65098039215686276 + Ansi 3 Color Alpha Component @@ -822,6 +1056,32 @@ Red Component 0.93333333333333335 + Ansi 3 Color (Dark) + + Alpha Component + 1 + Blue Component + 0.62352941176470589 + Color Space + sRGB + Green Component + 0.83137254901960789 + Red Component + 0.93333333333333335 + + Ansi 3 Color (Light) + + Alpha Component + 1 + Blue Component + 0.62352941176470589 + Color Space + sRGB + Green Component + 0.83137254901960789 + Red Component + 0.93333333333333335 + Ansi 4 Color Alpha Component @@ -835,6 +1095,32 @@ Red Component 0.54117647058823526 + Ansi 4 Color (Dark) + + Alpha Component + 1 + Blue Component + 0.95686274509803926 + Color Space + sRGB + Green Component + 0.67843137254901964 + Red Component + 0.54117647058823526 + + Ansi 4 Color (Light) + + Alpha Component + 1 + Blue Component + 0.95686274509803926 + Color Space + sRGB + Green Component + 0.67843137254901964 + Red Component + 0.54117647058823526 + Ansi 5 Color Alpha Component @@ -848,6 +1134,32 @@ Red Component 0.96078431372549022 + Ansi 5 Color (Dark) + + Alpha Component + 1 + Blue Component + 0.90196078431372551 + Color Space + sRGB + Green Component + 0.74117647058823533 + Red Component + 0.96078431372549022 + + Ansi 5 Color (Light) + + Alpha Component + 1 + Blue Component + 0.90196078431372551 + Color Space + sRGB + Green Component + 0.74117647058823533 + Red Component + 0.96078431372549022 + Ansi 6 Color Alpha Component @@ -861,6 +1173,32 @@ Red Component 0.54509803921568623 + Ansi 6 Color (Dark) + + Alpha Component + 1 + Blue Component + 0.792156862745098 + Color Space + sRGB + Green Component + 0.83529411764705885 + Red Component + 0.54509803921568623 + + Ansi 6 Color (Light) + + Alpha Component + 1 + Blue Component + 0.792156862745098 + Color Space + sRGB + Green Component + 0.83529411764705885 + Red Component + 0.54509803921568623 + Ansi 7 Color Alpha Component @@ -874,6 +1212,32 @@ Red Component 0.72156862745098038 + Ansi 7 Color (Dark) + + Alpha Component + 1 + Blue Component + 0.8784313725490196 + Color Space + sRGB + Green Component + 0.75294117647058822 + Red Component + 0.72156862745098038 + + Ansi 7 Color (Light) + + Alpha Component + 1 + Blue Component + 0.8784313725490196 + Color Space + sRGB + Green Component + 0.75294117647058822 + Red Component + 0.72156862745098038 + Ansi 8 Color Alpha Component @@ -887,6 +1251,32 @@ Red Component 0.35686274509803922 + Ansi 8 Color (Dark) + + Alpha Component + 1 + Blue Component + 0.47058823529411764 + Color Space + sRGB + Green Component + 0.37647058823529411 + Red Component + 0.35686274509803922 + + Ansi 8 Color (Light) + + Alpha Component + 1 + Blue Component + 0.47058823529411764 + Color Space + sRGB + Green Component + 0.37647058823529411 + Red Component + 0.35686274509803922 + Ansi 9 Color Alpha Component @@ -900,6 +1290,32 @@ Red Component 0.92941176470588238 + Ansi 9 Color (Dark) + + Alpha Component + 1 + Blue Component + 0.58823529411764708 + Color Space + sRGB + Green Component + 0.52941176470588236 + Red Component + 0.92941176470588238 + + Ansi 9 Color (Light) + + Alpha Component + 1 + Blue Component + 0.58823529411764708 + Color Space + sRGB + Green Component + 0.52941176470588236 + Red Component + 0.92941176470588238 + BM Growl Background Color @@ -915,6 +1331,32 @@ Red Component 0.14117647058823529 + Background Color (Dark) + + Alpha Component + 1 + Blue Component + 0.22745098039215686 + Color Space + sRGB + Green Component + 0.15294117647058825 + Red Component + 0.14117647058823529 + + Background Color (Light) + + Alpha Component + 1 + Blue Component + 0.22745098039215686 + Color Space + sRGB + Green Component + 0.15294117647058825 + Red Component + 0.14117647058823529 + Background Image Location Badge Color @@ -930,6 +1372,32 @@ Red Component 1 + Badge Color (Dark) + + Alpha Component + 0.5 + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.14910027384757996 + Red Component + 1 + + Badge Color (Light) + + Alpha Component + 0.5 + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.14910027384757996 + Red Component + 1 + Blinking Cursor Blur @@ -949,10 +1417,40 @@ Red Component 0.792156862745098 + Bold Color (Dark) + + Alpha Component + 1 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.82745098039215681 + Red Component + 0.792156862745098 + + Bold Color (Light) + + Alpha Component + 1 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.82745098039215681 + Red Component + 0.792156862745098 + Bound Hosts Brighten Bold Text + Brighten Bold Text (Dark) + + Brighten Bold Text (Light) + Character Encoding 4 Close Sessions On End @@ -961,6 +1459,10 @@ 100 Command + Cursor Boost (Dark) + 0.0 + Cursor Boost (Light) + 0.0 Cursor Color Alpha Component @@ -974,6 +1476,32 @@ Red Component 0.95686274509803926 + Cursor Color (Dark) + + Alpha Component + 1 + Blue Component + 0.83921568627450982 + Color Space + sRGB + Green Component + 0.85882352941176465 + Red Component + 0.95686274509803926 + + Cursor Color (Light) + + Alpha Component + 1 + Blue Component + 0.83921568627450982 + Color Space + sRGB + Green Component + 0.85882352941176465 + Red Component + 0.95686274509803926 + Cursor Guide Color Alpha Component @@ -987,6 +1515,32 @@ Red Component 0.792156862745098 + Cursor Guide Color (Dark) + + Alpha Component + 0.070000000000000007 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.82745098039215681 + Red Component + 0.792156862745098 + + Cursor Guide Color (Light) + + Alpha Component + 0.070000000000000007 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.82745098039215681 + Red Component + 0.792156862745098 + Cursor Text Color Alpha Component @@ -1000,6 +1554,32 @@ Red Component 0.792156862745098 + Cursor Text Color (Dark) + + Alpha Component + 1 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.82745098039215681 + Red Component + 0.792156862745098 + + Cursor Text Color (Light) + + Alpha Component + 1 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.82745098039215681 + Red Component + 0.792156862745098 + Cursor Type 2 Custom Command @@ -1012,6 +1592,10 @@ Default Disable Window Resizing + Faint Text Alpha (Dark) + 0.5 + Faint Text Alpha (Light) + 0.5 Flashing Bell Foreground Color @@ -1027,6 +1611,32 @@ Red Component 0.792156862745098 + Foreground Color (Dark) + + Alpha Component + 1 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.82745098039215681 + Red Component + 0.792156862745098 + + Foreground Color (Light) + + Alpha Component + 1 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.82745098039215681 + Red Component + 0.792156862745098 + Guid 176CC3A0-7519-4F56-A9CA-A13581E4DE4E Horizontal Spacing @@ -1043,288 +1653,7 @@ telnet Keyboard Map - - 0x2d-0x40000 - - Action - 11 - Text - 0x1f - - 0x32-0x40000 - - Action - 11 - Text - 0x00 - - 0x33-0x40000 - - Action - 11 - Text - 0x1b - - 0x34-0x40000 - - Action - 11 - Text - 0x1c - - 0x35-0x40000 - - Action - 11 - Text - 0x1d - - 0x36-0x40000 - - Action - 11 - Text - 0x1e - - 0x37-0x40000 - - Action - 11 - Text - 0x1f - - 0x38-0x40000 - - Action - 11 - Text - 0x7f - - 0xf700-0x220000 - - Action - 10 - Text - [1;2A - - 0xf700-0x240000 - - Action - 10 - Text - [1;5A - - 0xf700-0x260000 - - Action - 10 - Text - [1;6A - - 0xf700-0x280000 - - Action - 11 - Text - 0x1b 0x1b 0x5b 0x41 - - 0xf701-0x220000 - - Action - 10 - Text - [1;2B - - 0xf701-0x240000 - - Action - 10 - Text - [1;5B - - 0xf701-0x260000 - - Action - 10 - Text - [1;6B - - 0xf701-0x280000 - - Action - 11 - Text - 0x1b 0x1b 0x5b 0x42 - - 0xf702-0x220000 - - Action - 10 - Text - [1;2D - - 0xf702-0x240000 - - Action - 10 - Text - [1;5D - - 0xf702-0x260000 - - Action - 10 - Text - [1;6D - - 0xf702-0x280000 - - Action - 11 - Text - 0x1b 0x1b 0x5b 0x44 - - 0xf703-0x220000 - - Action - 10 - Text - [1;2C - - 0xf703-0x240000 - - Action - 10 - Text - [1;5C - - 0xf703-0x260000 - - Action - 10 - Text - [1;6C - - 0xf703-0x280000 - - Action - 11 - Text - 0x1b 0x1b 0x5b 0x43 - - 0xf704-0x20000 - - Action - 10 - Text - [1;2P - - 0xf705-0x20000 - - Action - 10 - Text - [1;2Q - - 0xf706-0x20000 - - Action - 10 - Text - [1;2R - - 0xf707-0x20000 - - Action - 10 - Text - [1;2S - - 0xf708-0x20000 - - Action - 10 - Text - [15;2~ - - 0xf709-0x20000 - - Action - 10 - Text - [17;2~ - - 0xf70a-0x20000 - - Action - 10 - Text - [18;2~ - - 0xf70b-0x20000 - - Action - 10 - Text - [19;2~ - - 0xf70c-0x20000 - - Action - 10 - Text - [20;2~ - - 0xf70d-0x20000 - - Action - 10 - Text - [21;2~ - - 0xf70e-0x20000 - - Action - 10 - Text - [23;2~ - - 0xf70f-0x20000 - - Action - 10 - Text - [24;2~ - - 0xf729-0x20000 - - Action - 10 - Text - [1;2H - - 0xf729-0x40000 - - Action - 10 - Text - [1;5H - - 0xf72b-0x20000 - - Action - 10 - Text - [1;2F - - 0xf72b-0x40000 - - Action - 10 - Text - [1;5F - - + Link Color Alpha Component @@ -1338,6 +1667,62 @@ Red Component 0.56862745098039214 + Link Color (Dark) + + Alpha Component + 1 + Blue Component + 0.8901960784313725 + Color Space + sRGB + Green Component + 0.84313725490196079 + Red Component + 0.56862745098039214 + + Link Color (Light) + + Alpha Component + 1 + Blue Component + 0.8901960784313725 + Color Space + sRGB + Green Component + 0.84313725490196079 + Red Component + 0.56862745098039214 + + Match Background Color (Dark) + + Alpha Component + 1 + Blue Component + 0.0 + Color Space + P3 + Green Component + 1 + Red Component + 1 + + Match Background Color (Light) + + Alpha Component + 1 + Blue Component + 0.0 + Color Space + P3 + Green Component + 1 + Red Component + 1 + + Minimum Contrast (Dark) + 0.0 + Minimum Contrast (Light) + 0.0 Mouse Reporting Name @@ -1361,7 +1746,7 @@ Screen -1 Scrollback Lines - 1000 + 0 Selected Text Color Alpha Component @@ -1375,6 +1760,32 @@ Red Component 0.792156862745098 + Selected Text Color (Dark) + + Alpha Component + 1 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.82745098039215681 + Red Component + 0.792156862745098 + + Selected Text Color (Light) + + Alpha Component + 1 + Blue Component + 0.96078431372549022 + Color Space + sRGB + Green Component + 0.82745098039215681 + Red Component + 0.792156862745098 + Selection Color Alpha Component @@ -1388,12 +1799,42 @@ Red Component 0.35686274509803922 + Selection Color (Dark) + + Alpha Component + 1 + Blue Component + 0.47058823529411764 + Color Space + sRGB + Green Component + 0.37647058823529411 + Red Component + 0.35686274509803922 + + Selection Color (Light) + + Alpha Component + 1 + Blue Component + 0.47058823529411764 + Color Space + sRGB + Green Component + 0.37647058823529411 + Red Component + 0.35686274509803922 + Send Code When Idle Shortcut Silence Bell + Smart Cursor Color (Dark) + + Smart Cursor Color (Light) + Sync Title Tags @@ -1405,15 +1846,37 @@ Transparency 0.0 Unlimited Scrollback - + Use Bold Font Use Bright Bold + Use Bright Bold (Dark) + + Use Bright Bold (Light) + + Use Cursor Guide (Dark) + + Use Cursor Guide (Light) + Use Italic Font Use Non-ASCII Font + Use Selected Text Color (Dark) + + Use Selected Text Color (Light) + + Use Separate Colors for Light and Dark Mode + + Use Tab Color (Dark) + + Use Tab Color (Light) + + Use Underline Color (Dark) + + Use Underline Color (Light) + Vertical Spacing 1.25 Visual Bell @@ -1468,7 +1931,7 @@ PromptOnQuit ShowFullScreenTabBar - + SoundForEsc SplitPaneDimmingAmount diff --git a/karabiner/automatic_backups/karabiner_20240630.json b/karabiner/automatic_backups/karabiner_20240630.json new file mode 100644 index 0000000..bb84854 --- /dev/null +++ b/karabiner/automatic_backups/karabiner_20240630.json @@ -0,0 +1,393 @@ +{ + "global": { + "ask_for_confirmation_before_quitting": true, + "check_for_updates_on_startup": true, + "show_in_menu_bar": true, + "show_profile_name_in_menu_bar": false, + "unsafe_ui": false + }, + "profiles": [ + { + "complex_modifications": { + "parameters": { + "basic.simultaneous_threshold_milliseconds": 50, + "basic.to_delayed_action_delay_milliseconds": 500, + "basic.to_if_alone_timeout_milliseconds": 500, + "basic.to_if_held_down_threshold_milliseconds": 500, + "mouse_motion_to_scroll.speed": 100 + }, + "rules": [ + { + "description": "Post Esc if Caps is tapped, Control if held.", + "manipulators": [ + { + "from": { + "key_code": "left_control", + "modifiers": { + "optional": [ + "any" + ] + } + }, + "to": [ + { + "key_code": "left_control", + "lazy": true + } + ], + "to_if_alone": [ + { + "key_code": "escape" + } + ], + "type": "basic" + } + ] + } + ] + }, + "devices": [ + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "identifiers": { + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 641, + "vendor_id": 1452 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "identifiers": { + "is_keyboard": false, + "is_pointing_device": true, + "product_id": 641, + "vendor_id": 1452 + }, + "ignore": true, + "manipulate_caps_lock_led": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "identifiers": { + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 666, + "vendor_id": 76 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "identifiers": { + "is_keyboard": false, + "is_pointing_device": true, + "product_id": 613, + "vendor_id": 1452 + }, + "ignore": true, + "manipulate_caps_lock_led": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "identifiers": { + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 50504, + "vendor_id": 1133 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "identifiers": { + "is_keyboard": false, + "is_pointing_device": true, + "product_id": 50504, + "vendor_id": 1133 + }, + "ignore": true, + "manipulate_caps_lock_led": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "identifiers": { + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 45849, + "vendor_id": 1133 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "simple_modifications": [ + { + "from": { + "key_code": "left_command" + }, + "to": [ + { + "key_code": "left_option" + } + ] + }, + { + "from": { + "key_code": "left_option" + }, + "to": [ + { + "key_code": "left_command" + } + ] + } + ], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "identifiers": { + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 50475, + "vendor_id": 1133 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "identifiers": { + "is_keyboard": false, + "is_pointing_device": true, + "product_id": 50475, + "vendor_id": 1133 + }, + "ignore": true, + "manipulate_caps_lock_led": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "identifiers": { + "is_keyboard": true, + "is_pointing_device": true, + "product_id": 45081, + "vendor_id": 1133 + }, + "ignore": true, + "manipulate_caps_lock_led": true, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "identifiers": { + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 615, + "vendor_id": 76 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "simple_modifications": [ + { + "from": { + "consumer_key_code": "eject" + }, + "to": [ + { + "consumer_key_code": "al_terminal_lock_or_screensaver" + } + ] + } + ], + "treat_as_built_in_keyboard": false + } + ], + "fn_function_keys": [ + { + "from": { + "key_code": "f1" + }, + "to": [ + { + "consumer_key_code": "display_brightness_decrement" + } + ] + }, + { + "from": { + "key_code": "f2" + }, + "to": [ + { + "consumer_key_code": "display_brightness_increment" + } + ] + }, + { + "from": { + "key_code": "f3" + }, + "to": [ + { + "apple_vendor_keyboard_key_code": "mission_control" + } + ] + }, + { + "from": { + "key_code": "f4" + }, + "to": [ + { + "apple_vendor_keyboard_key_code": "spotlight" + } + ] + }, + { + "from": { + "key_code": "f5" + }, + "to": [ + { + "consumer_key_code": "dictation" + } + ] + }, + { + "from": { + "key_code": "f6" + }, + "to": [ + { + "key_code": "f6" + } + ] + }, + { + "from": { + "key_code": "f7" + }, + "to": [ + { + "consumer_key_code": "rewind" + } + ] + }, + { + "from": { + "key_code": "f8" + }, + "to": [ + { + "consumer_key_code": "play_or_pause" + } + ] + }, + { + "from": { + "key_code": "f9" + }, + "to": [ + { + "consumer_key_code": "fast_forward" + } + ] + }, + { + "from": { + "key_code": "f10" + }, + "to": [ + { + "consumer_key_code": "mute" + } + ] + }, + { + "from": { + "key_code": "f11" + }, + "to": [ + { + "consumer_key_code": "volume_decrement" + } + ] + }, + { + "from": { + "key_code": "f12" + }, + "to": [ + { + "consumer_key_code": "volume_increment" + } + ] + } + ], + "name": "Default profile", + "parameters": { + "delay_milliseconds_before_open_device": 1000 + }, + "selected": true, + "simple_modifications": [ + { + "from": { + "key_code": "caps_lock" + }, + "to": [ + { + "key_code": "left_control" + } + ] + }, + { + "from": { + "key_code": "escape" + }, + "to": [ + { + "key_code": "caps_lock" + } + ] + } + ], + "virtual_hid_keyboard": { + "country_code": 0, + "indicate_sticky_modifier_keys_state": true, + "mouse_key_xy_scale": 100 + } + } + ] +} \ No newline at end of file diff --git a/karabiner/automatic_backups/karabiner_20240924.json b/karabiner/automatic_backups/karabiner_20240924.json new file mode 100644 index 0000000..d7322fb --- /dev/null +++ b/karabiner/automatic_backups/karabiner_20240924.json @@ -0,0 +1,503 @@ +{ + "global": { + "ask_for_confirmation_before_quitting": true, + "check_for_updates_on_startup": true, + "show_in_menu_bar": true, + "show_profile_name_in_menu_bar": false, + "unsafe_ui": false + }, + "profiles": [ + { + "complex_modifications": { + "parameters": { + "basic.simultaneous_threshold_milliseconds": 50, + "basic.to_delayed_action_delay_milliseconds": 500, + "basic.to_if_alone_timeout_milliseconds": 500, + "basic.to_if_held_down_threshold_milliseconds": 500, + "mouse_motion_to_scroll.speed": 100 + }, + "rules": [ + { + "description": "Post Esc if Caps is tapped, Control if held.", + "manipulators": [ + { + "from": { + "key_code": "left_control", + "modifiers": { + "optional": [ + "any" + ] + } + }, + "to": [ + { + "key_code": "left_control", + "lazy": true + } + ], + "to_if_alone": [ + { + "key_code": "escape" + } + ], + "type": "basic" + } + ] + } + ] + }, + "devices": [ + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 641, + "vendor_id": 1452 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": false, + "is_pointing_device": true, + "product_id": 641, + "vendor_id": 1452 + }, + "ignore": true, + "manipulate_caps_lock_led": false, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 666, + "vendor_id": 76 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": false, + "is_pointing_device": true, + "product_id": 613, + "vendor_id": 1452 + }, + "ignore": true, + "manipulate_caps_lock_led": false, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 50504, + "vendor_id": 1133 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": false, + "is_pointing_device": true, + "product_id": 50504, + "vendor_id": 1133 + }, + "ignore": true, + "manipulate_caps_lock_led": false, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 45849, + "vendor_id": 1133 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [ + { + "from": { + "key_code": "left_command" + }, + "to": [ + { + "key_code": "left_option" + } + ] + }, + { + "from": { + "key_code": "left_option" + }, + "to": [ + { + "key_code": "left_command" + } + ] + } + ], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 50475, + "vendor_id": 1133 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": false, + "is_pointing_device": true, + "product_id": 50475, + "vendor_id": 1133 + }, + "ignore": true, + "manipulate_caps_lock_led": false, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": true, + "is_pointing_device": true, + "product_id": 45081, + "vendor_id": 1133 + }, + "ignore": true, + "manipulate_caps_lock_led": true, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 615, + "vendor_id": 76 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [ + { + "from": { + "consumer_key_code": "eject" + }, + "to": [ + { + "consumer_key_code": "al_terminal_lock_or_screensaver" + } + ] + } + ], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 45927, + "vendor_id": 1133 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + } + ], + "fn_function_keys": [ + { + "from": { + "key_code": "f1" + }, + "to": [ + { + "consumer_key_code": "display_brightness_decrement" + } + ] + }, + { + "from": { + "key_code": "f2" + }, + "to": [ + { + "consumer_key_code": "display_brightness_increment" + } + ] + }, + { + "from": { + "key_code": "f3" + }, + "to": [ + { + "apple_vendor_keyboard_key_code": "mission_control" + } + ] + }, + { + "from": { + "key_code": "f4" + }, + "to": [ + { + "apple_vendor_keyboard_key_code": "spotlight" + } + ] + }, + { + "from": { + "key_code": "f5" + }, + "to": [ + { + "consumer_key_code": "dictation" + } + ] + }, + { + "from": { + "key_code": "f6" + }, + "to": [ + { + "key_code": "f6" + } + ] + }, + { + "from": { + "key_code": "f7" + }, + "to": [ + { + "consumer_key_code": "rewind" + } + ] + }, + { + "from": { + "key_code": "f8" + }, + "to": [ + { + "consumer_key_code": "play_or_pause" + } + ] + }, + { + "from": { + "key_code": "f9" + }, + "to": [ + { + "consumer_key_code": "fast_forward" + } + ] + }, + { + "from": { + "key_code": "f10" + }, + "to": [ + { + "consumer_key_code": "mute" + } + ] + }, + { + "from": { + "key_code": "f11" + }, + "to": [ + { + "consumer_key_code": "volume_decrement" + } + ] + }, + { + "from": { + "key_code": "f12" + }, + "to": [ + { + "consumer_key_code": "volume_increment" + } + ] + } + ], + "name": "Default profile", + "parameters": { + "delay_milliseconds_before_open_device": 1000 + }, + "selected": true, + "simple_modifications": [ + { + "from": { + "key_code": "caps_lock" + }, + "to": [ + { + "key_code": "left_control" + } + ] + }, + { + "from": { + "key_code": "escape" + }, + "to": [ + { + "key_code": "caps_lock" + } + ] + } + ], + "virtual_hid_keyboard": { + "country_code": 0, + "indicate_sticky_modifier_keys_state": true, + "mouse_key_xy_scale": 100 + } + } + ] +} \ No newline at end of file diff --git a/karabiner/automatic_backups/karabiner_20241012.json b/karabiner/automatic_backups/karabiner_20241012.json new file mode 100644 index 0000000..d7322fb --- /dev/null +++ b/karabiner/automatic_backups/karabiner_20241012.json @@ -0,0 +1,503 @@ +{ + "global": { + "ask_for_confirmation_before_quitting": true, + "check_for_updates_on_startup": true, + "show_in_menu_bar": true, + "show_profile_name_in_menu_bar": false, + "unsafe_ui": false + }, + "profiles": [ + { + "complex_modifications": { + "parameters": { + "basic.simultaneous_threshold_milliseconds": 50, + "basic.to_delayed_action_delay_milliseconds": 500, + "basic.to_if_alone_timeout_milliseconds": 500, + "basic.to_if_held_down_threshold_milliseconds": 500, + "mouse_motion_to_scroll.speed": 100 + }, + "rules": [ + { + "description": "Post Esc if Caps is tapped, Control if held.", + "manipulators": [ + { + "from": { + "key_code": "left_control", + "modifiers": { + "optional": [ + "any" + ] + } + }, + "to": [ + { + "key_code": "left_control", + "lazy": true + } + ], + "to_if_alone": [ + { + "key_code": "escape" + } + ], + "type": "basic" + } + ] + } + ] + }, + "devices": [ + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 641, + "vendor_id": 1452 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": false, + "is_pointing_device": true, + "product_id": 641, + "vendor_id": 1452 + }, + "ignore": true, + "manipulate_caps_lock_led": false, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 666, + "vendor_id": 76 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": false, + "is_pointing_device": true, + "product_id": 613, + "vendor_id": 1452 + }, + "ignore": true, + "manipulate_caps_lock_led": false, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 50504, + "vendor_id": 1133 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": false, + "is_pointing_device": true, + "product_id": 50504, + "vendor_id": 1133 + }, + "ignore": true, + "manipulate_caps_lock_led": false, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 45849, + "vendor_id": 1133 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [ + { + "from": { + "key_code": "left_command" + }, + "to": [ + { + "key_code": "left_option" + } + ] + }, + { + "from": { + "key_code": "left_option" + }, + "to": [ + { + "key_code": "left_command" + } + ] + } + ], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 50475, + "vendor_id": 1133 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": false, + "is_pointing_device": true, + "product_id": 50475, + "vendor_id": 1133 + }, + "ignore": true, + "manipulate_caps_lock_led": false, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": true, + "is_pointing_device": true, + "product_id": 45081, + "vendor_id": 1133 + }, + "ignore": true, + "manipulate_caps_lock_led": true, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 615, + "vendor_id": 76 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [ + { + "from": { + "consumer_key_code": "eject" + }, + "to": [ + { + "consumer_key_code": "al_terminal_lock_or_screensaver" + } + ] + } + ], + "treat_as_built_in_keyboard": false + }, + { + "disable_built_in_keyboard_if_exists": false, + "fn_function_keys": [], + "game_pad_swap_sticks": false, + "identifiers": { + "is_game_pad": false, + "is_keyboard": true, + "is_pointing_device": false, + "product_id": 45927, + "vendor_id": 1133 + }, + "ignore": false, + "manipulate_caps_lock_led": true, + "mouse_flip_horizontal_wheel": false, + "mouse_flip_vertical_wheel": false, + "mouse_flip_x": false, + "mouse_flip_y": false, + "mouse_swap_wheels": false, + "mouse_swap_xy": false, + "simple_modifications": [], + "treat_as_built_in_keyboard": false + } + ], + "fn_function_keys": [ + { + "from": { + "key_code": "f1" + }, + "to": [ + { + "consumer_key_code": "display_brightness_decrement" + } + ] + }, + { + "from": { + "key_code": "f2" + }, + "to": [ + { + "consumer_key_code": "display_brightness_increment" + } + ] + }, + { + "from": { + "key_code": "f3" + }, + "to": [ + { + "apple_vendor_keyboard_key_code": "mission_control" + } + ] + }, + { + "from": { + "key_code": "f4" + }, + "to": [ + { + "apple_vendor_keyboard_key_code": "spotlight" + } + ] + }, + { + "from": { + "key_code": "f5" + }, + "to": [ + { + "consumer_key_code": "dictation" + } + ] + }, + { + "from": { + "key_code": "f6" + }, + "to": [ + { + "key_code": "f6" + } + ] + }, + { + "from": { + "key_code": "f7" + }, + "to": [ + { + "consumer_key_code": "rewind" + } + ] + }, + { + "from": { + "key_code": "f8" + }, + "to": [ + { + "consumer_key_code": "play_or_pause" + } + ] + }, + { + "from": { + "key_code": "f9" + }, + "to": [ + { + "consumer_key_code": "fast_forward" + } + ] + }, + { + "from": { + "key_code": "f10" + }, + "to": [ + { + "consumer_key_code": "mute" + } + ] + }, + { + "from": { + "key_code": "f11" + }, + "to": [ + { + "consumer_key_code": "volume_decrement" + } + ] + }, + { + "from": { + "key_code": "f12" + }, + "to": [ + { + "consumer_key_code": "volume_increment" + } + ] + } + ], + "name": "Default profile", + "parameters": { + "delay_milliseconds_before_open_device": 1000 + }, + "selected": true, + "simple_modifications": [ + { + "from": { + "key_code": "caps_lock" + }, + "to": [ + { + "key_code": "left_control" + } + ] + }, + { + "from": { + "key_code": "escape" + }, + "to": [ + { + "key_code": "caps_lock" + } + ] + } + ], + "virtual_hid_keyboard": { + "country_code": 0, + "indicate_sticky_modifier_keys_state": true, + "mouse_key_xy_scale": 100 + } + } + ] +} \ No newline at end of file diff --git a/karabiner/automatic_backups/karabiner_20241015.json b/karabiner/automatic_backups/karabiner_20241015.json new file mode 100644 index 0000000..b65481c --- /dev/null +++ b/karabiner/automatic_backups/karabiner_20241015.json @@ -0,0 +1,78 @@ +{ + "profiles": [ + { + "complex_modifications": { + "parameters": { "basic.to_if_alone_timeout_milliseconds": 500 }, + "rules": [ + { + "description": "Post Esc if Caps is tapped, Control if held.", + "manipulators": [ + { + "from": { + "key_code": "left_control", + "modifiers": { "optional": ["any"] } + }, + "to": [ + { + "key_code": "left_control", + "lazy": true + } + ], + "to_if_alone": [{ "key_code": "escape" }], + "type": "basic" + } + ] + } + ] + }, + "devices": [ + { + "identifiers": { + "is_keyboard": true, + "product_id": 45849, + "vendor_id": 1133 + }, + "simple_modifications": [ + { + "from": { "key_code": "left_command" }, + "to": [{ "key_code": "left_option" }] + }, + { + "from": { "key_code": "left_option" }, + "to": [{ "key_code": "left_command" }] + } + ] + }, + { + "identifiers": { + "is_keyboard": true, + "product_id": 615, + "vendor_id": 76 + }, + "simple_modifications": [ + { + "from": { "consumer_key_code": "eject" }, + "to": [{ "consumer_key_code": "al_terminal_lock_or_screensaver" }] + } + ] + } + ], + "name": "Default profile", + "selected": true, + "simple_modifications": [ + { + "from": { "key_code": "caps_lock" }, + "to": [{ "key_code": "left_control" }] + }, + { + "from": { "key_code": "escape" }, + "to": [{ "key_code": "caps_lock" }] + } + ], + "virtual_hid_keyboard": { + "country_code": 0, + "keyboard_type_v2": "ansi" + } + } + ] +} \ No newline at end of file diff --git a/karabiner/automatic_backups/karabiner_20250203.json b/karabiner/automatic_backups/karabiner_20250203.json new file mode 100644 index 0000000..e65add6 --- /dev/null +++ b/karabiner/automatic_backups/karabiner_20250203.json @@ -0,0 +1,149 @@ +{ + "profiles": [ + { + "complex_modifications": { + "parameters": { "basic.to_if_alone_timeout_milliseconds": 500 }, + "rules": [ + { + "description": "Map control+option+arrows to fn+control+arrows", + "enabled": false, + "manipulators": [ + { + "from": { + "key_code": "left_arrow", + "modifiers": { "mandatory": ["control", "option"] } + }, + "to": [ + { + "key_code": "left_arrow", + "modifiers": ["fn", "control"] + } + ], + "type": "basic" + }, + { + "from": { + "key_code": "right_arrow", + "modifiers": { "mandatory": ["control", "option"] } + }, + "to": [ + { + "key_code": "right_arrow", + "modifiers": ["fn", "control"] + } + ], + "type": "basic" + }, + { + "from": { + "key_code": "up_arrow", + "modifiers": { "mandatory": ["control", "option"] } + }, + "to": [ + { + "key_code": "up_arrow", + "modifiers": ["fn", "control"] + } + ], + "type": "basic" + }, + { + "from": { + "key_code": "down_arrow", + "modifiers": { "mandatory": ["control", "option"] } + }, + "to": [ + { + "key_code": "down_arrow", + "modifiers": ["fn", "control"] + } + ], + "type": "basic" + }, + { + "from": { + "key_code": "f", + "modifiers": { "mandatory": ["control", "option"] } + }, + "to": [ + { + "key_code": "f", + "modifiers": ["fn", "control"] + } + ], + "type": "basic" + } + ] + }, + { + "description": "Post Esc if Caps is tapped, Control if held.", + "manipulators": [ + { + "from": { + "key_code": "left_control", + "modifiers": { "optional": ["any"] } + }, + "to": [ + { + "key_code": "left_control", + "lazy": true + } + ], + "to_if_alone": [{ "key_code": "escape" }], + "type": "basic" + } + ] + } + ] + }, + "devices": [ + { + "identifiers": { + "is_keyboard": true, + "product_id": 45849, + "vendor_id": 1133 + }, + "simple_modifications": [ + { + "from": { "key_code": "left_command" }, + "to": [{ "key_code": "left_option" }] + }, + { + "from": { "key_code": "left_option" }, + "to": [{ "key_code": "left_command" }] + } + ] + }, + { + "identifiers": { + "is_keyboard": true, + "product_id": 615, + "vendor_id": 76 + }, + "simple_modifications": [ + { + "from": { "consumer_key_code": "eject" }, + "to": [{ "consumer_key_code": "al_terminal_lock_or_screensaver" }] + } + ] + } + ], + "name": "Default profile", + "selected": true, + "simple_modifications": [ + { + "from": { "key_code": "caps_lock" }, + "to": [{ "key_code": "left_control" }] + }, + { + "from": { "key_code": "escape" }, + "to": [{ "key_code": "caps_lock" }] + } + ], + "virtual_hid_keyboard": { + "country_code": 0, + "keyboard_type_v2": "ansi" + } + } + ] +} \ No newline at end of file diff --git a/karabiner/karabiner.json b/karabiner/karabiner.json index bb84854..b65481c 100644 --- a/karabiner/karabiner.json +++ b/karabiner/karabiner.json @@ -1,21 +1,8 @@ { - "global": { - "ask_for_confirmation_before_quitting": true, - "check_for_updates_on_startup": true, - "show_in_menu_bar": true, - "show_profile_name_in_menu_bar": false, - "unsafe_ui": false - }, "profiles": [ { "complex_modifications": { - "parameters": { - "basic.simultaneous_threshold_milliseconds": 50, - "basic.to_delayed_action_delay_milliseconds": 500, - "basic.to_if_alone_timeout_milliseconds": 500, - "basic.to_if_held_down_threshold_milliseconds": 500, - "mouse_motion_to_scroll.speed": 100 - }, + "parameters": { "basic.to_if_alone_timeout_milliseconds": 500 }, "rules": [ { "description": "Post Esc if Caps is tapped, Control if held.", @@ -23,11 +10,7 @@ { "from": { "key_code": "left_control", - "modifiers": { - "optional": [ - "any" - ] - } + "modifiers": { "optional": ["any"] } }, "to": [ { @@ -35,11 +18,7 @@ "lazy": true } ], - "to_if_alone": [ - { - "key_code": "escape" - } - ], + "to_if_alone": [{ "key_code": "escape" }], "type": "basic" } ] @@ -48,345 +27,51 @@ }, "devices": [ { - "disable_built_in_keyboard_if_exists": false, - "fn_function_keys": [], "identifiers": { "is_keyboard": true, - "is_pointing_device": false, - "product_id": 641, - "vendor_id": 1452 - }, - "ignore": false, - "manipulate_caps_lock_led": true, - "simple_modifications": [], - "treat_as_built_in_keyboard": false - }, - { - "disable_built_in_keyboard_if_exists": false, - "fn_function_keys": [], - "identifiers": { - "is_keyboard": false, - "is_pointing_device": true, - "product_id": 641, - "vendor_id": 1452 - }, - "ignore": true, - "manipulate_caps_lock_led": false, - "simple_modifications": [], - "treat_as_built_in_keyboard": false - }, - { - "disable_built_in_keyboard_if_exists": false, - "fn_function_keys": [], - "identifiers": { - "is_keyboard": true, - "is_pointing_device": false, - "product_id": 666, - "vendor_id": 76 - }, - "ignore": false, - "manipulate_caps_lock_led": true, - "simple_modifications": [], - "treat_as_built_in_keyboard": false - }, - { - "disable_built_in_keyboard_if_exists": false, - "fn_function_keys": [], - "identifiers": { - "is_keyboard": false, - "is_pointing_device": true, - "product_id": 613, - "vendor_id": 1452 - }, - "ignore": true, - "manipulate_caps_lock_led": false, - "simple_modifications": [], - "treat_as_built_in_keyboard": false - }, - { - "disable_built_in_keyboard_if_exists": false, - "fn_function_keys": [], - "identifiers": { - "is_keyboard": true, - "is_pointing_device": false, - "product_id": 50504, - "vendor_id": 1133 - }, - "ignore": false, - "manipulate_caps_lock_led": true, - "simple_modifications": [], - "treat_as_built_in_keyboard": false - }, - { - "disable_built_in_keyboard_if_exists": false, - "fn_function_keys": [], - "identifiers": { - "is_keyboard": false, - "is_pointing_device": true, - "product_id": 50504, - "vendor_id": 1133 - }, - "ignore": true, - "manipulate_caps_lock_led": false, - "simple_modifications": [], - "treat_as_built_in_keyboard": false - }, - { - "disable_built_in_keyboard_if_exists": false, - "fn_function_keys": [], - "identifiers": { - "is_keyboard": true, - "is_pointing_device": false, "product_id": 45849, "vendor_id": 1133 }, - "ignore": false, - "manipulate_caps_lock_led": true, "simple_modifications": [ { - "from": { - "key_code": "left_command" - }, - "to": [ - { - "key_code": "left_option" - } - ] + "from": { "key_code": "left_command" }, + "to": [{ "key_code": "left_option" }] }, { - "from": { - "key_code": "left_option" - }, - "to": [ - { - "key_code": "left_command" - } - ] + "from": { "key_code": "left_option" }, + "to": [{ "key_code": "left_command" }] } - ], - "treat_as_built_in_keyboard": false + ] }, { - "disable_built_in_keyboard_if_exists": false, - "fn_function_keys": [], "identifiers": { "is_keyboard": true, - "is_pointing_device": false, - "product_id": 50475, - "vendor_id": 1133 - }, - "ignore": false, - "manipulate_caps_lock_led": true, - "simple_modifications": [], - "treat_as_built_in_keyboard": false - }, - { - "disable_built_in_keyboard_if_exists": false, - "fn_function_keys": [], - "identifiers": { - "is_keyboard": false, - "is_pointing_device": true, - "product_id": 50475, - "vendor_id": 1133 - }, - "ignore": true, - "manipulate_caps_lock_led": false, - "simple_modifications": [], - "treat_as_built_in_keyboard": false - }, - { - "disable_built_in_keyboard_if_exists": false, - "fn_function_keys": [], - "identifiers": { - "is_keyboard": true, - "is_pointing_device": true, - "product_id": 45081, - "vendor_id": 1133 - }, - "ignore": true, - "manipulate_caps_lock_led": true, - "simple_modifications": [], - "treat_as_built_in_keyboard": false - }, - { - "disable_built_in_keyboard_if_exists": false, - "fn_function_keys": [], - "identifiers": { - "is_keyboard": true, - "is_pointing_device": false, "product_id": 615, "vendor_id": 76 }, - "ignore": false, - "manipulate_caps_lock_led": true, "simple_modifications": [ { - "from": { - "consumer_key_code": "eject" - }, - "to": [ - { - "consumer_key_code": "al_terminal_lock_or_screensaver" - } - ] - } - ], - "treat_as_built_in_keyboard": false - } - ], - "fn_function_keys": [ - { - "from": { - "key_code": "f1" - }, - "to": [ - { - "consumer_key_code": "display_brightness_decrement" - } - ] - }, - { - "from": { - "key_code": "f2" - }, - "to": [ - { - "consumer_key_code": "display_brightness_increment" - } - ] - }, - { - "from": { - "key_code": "f3" - }, - "to": [ - { - "apple_vendor_keyboard_key_code": "mission_control" - } - ] - }, - { - "from": { - "key_code": "f4" - }, - "to": [ - { - "apple_vendor_keyboard_key_code": "spotlight" - } - ] - }, - { - "from": { - "key_code": "f5" - }, - "to": [ - { - "consumer_key_code": "dictation" - } - ] - }, - { - "from": { - "key_code": "f6" - }, - "to": [ - { - "key_code": "f6" - } - ] - }, - { - "from": { - "key_code": "f7" - }, - "to": [ - { - "consumer_key_code": "rewind" - } - ] - }, - { - "from": { - "key_code": "f8" - }, - "to": [ - { - "consumer_key_code": "play_or_pause" - } - ] - }, - { - "from": { - "key_code": "f9" - }, - "to": [ - { - "consumer_key_code": "fast_forward" - } - ] - }, - { - "from": { - "key_code": "f10" - }, - "to": [ - { - "consumer_key_code": "mute" - } - ] - }, - { - "from": { - "key_code": "f11" - }, - "to": [ - { - "consumer_key_code": "volume_decrement" - } - ] - }, - { - "from": { - "key_code": "f12" - }, - "to": [ - { - "consumer_key_code": "volume_increment" + "from": { "consumer_key_code": "eject" }, + "to": [{ "consumer_key_code": "al_terminal_lock_or_screensaver" }] } ] } ], "name": "Default profile", - "parameters": { - "delay_milliseconds_before_open_device": 1000 - }, "selected": true, "simple_modifications": [ { - "from": { - "key_code": "caps_lock" - }, - "to": [ - { - "key_code": "left_control" - } - ] + "from": { "key_code": "caps_lock" }, + "to": [{ "key_code": "left_control" }] }, { - "from": { - "key_code": "escape" - }, - "to": [ - { - "key_code": "caps_lock" - } - ] + "from": { "key_code": "escape" }, + "to": [{ "key_code": "caps_lock" }] } ], "virtual_hid_keyboard": { "country_code": 0, - "indicate_sticky_modifier_keys_state": true, - "mouse_key_xy_scale": 100 + "keyboard_type_v2": "ansi" } } ] diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 92b34b9..79e04a1 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,27 +1,27 @@ { - "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "auto-session": { "branch": "main", "commit": "51196ca66b38fc1660fdf50031cb0b31a199b7c9" }, - "catppuccin": { "branch": "main", "commit": "c2e6f8e7eb8d0ebf55700c89bdf842809aeecf09" }, - "coc.nvim": { "branch": "release", "commit": "7b9e1ef0a1399907c51d23b6080b94a5aba4a654" }, - "code_runner.nvim": { "branch": "main", "commit": "0c701cae3265c79b4fdfd4b35a4f3d7c5986d46c" }, - "copilot.vim": { "branch": "release", "commit": "22fd9542e3c47552abab5e685fefd760e4f405b2" }, + "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, + "auto-session": { "branch": "main", "commit": "aa01054d478c6d3efc0188cb2ed4850e9f475664" }, + "catppuccin": { "branch": "main", "commit": "4fd72a9ab64b393c2c22b168508fd244877fec96" }, + "coc.nvim": { "branch": "release", "commit": "69b16f8651b4d92d9ea5d6b000c084f275ed7928" }, + "code_runner.nvim": { "branch": "main", "commit": "dcedccbf969a0f3bc00db446172b4966e83101dd" }, "git-conflict.nvim": { "branch": "main", "commit": "80bc8931d4ed8c8c4d289a08e1838fcf4741408d" }, - "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, - "lazy.nvim": { "branch": "main", "commit": "c882227f1fdc4580d14212df8f814a0772951e3d" }, - "leap.nvim": { "branch": "main", "commit": "14eda5bb233354933baa99b6d40bef3a40dbeaae" }, + "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, + "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, + "leap.nvim": { "branch": "main", "commit": "c6bfb191f1161fbabace1f36f578a20ac6c7642c" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "neoscroll.nvim": { "branch": "master", "commit": "be4ebf855a52f71ca4338694a5696675d807eff9" }, - "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, - "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" }, + "neoscroll.nvim": { "branch": "master", "commit": "4e0428a41c6ec191df543fc95349f6e1c598e53f" }, + "nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" }, + "nvim-scrollbar": { "branch": "main", "commit": "d09f14aa16c9f2748e77008f9da7b1f76e4e7b85" }, "nvim-toggleterm.lua": { "branch": "main", "commit": "a5638b2206c3930a16a24e5c184dddd572f8cd34" }, "nvim-tree.lua": { "branch": "master", "commit": "e14989c0eaa6f9c299d48f7e45ce1ed04b21180f" }, - "nvim-web-devicons": { "branch": "master", "commit": "aaec87dbdaa776bfa0a13c8694bec9bcb7454719" }, - "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, + "nvim-web-devicons": { "branch": "master", "commit": "9154484705968658e9aab2b894d1b2a64bf9f83d" }, + "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, + "supermaven-nvim": { "branch": "main", "commit": "b9f1eb32a4ca1782923ca0d4284d5c713583e4d4" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" }, "vim-astro": { "branch": "main", "commit": "9b4674ecfe1dd84b5fb9b4de1653975de6e8e2e1" }, "vim-polyglot": { "branch": "master", "commit": "bc8a81d3592dab86334f27d1d43c080ebf680d42" }, - "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, + "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "vim-visual-multi": { "branch": "master", "commit": "e67f7fa011c98fc5426352d3bb06362a0f70af3c" } + "vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" } } \ No newline at end of file diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 2e1a300..f9abb27 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -125,18 +125,18 @@ require("lazy").setup({ branch = "master", }, - -- GitHub Copilot + -- Supermaven AI assist { - "github/copilot.vim", - cmd = "CPE", -- Don't load until enable command is run + "supermaven-inc/supermaven-nvim", config = function() - vim.api.nvim_create_user_command("CPE", "Copilot enable", {}) - vim.api.nvim_create_user_command("CPD", "Copilot disable", {}) + vim.api.nvim_create_user_command("CPE", "SupermavenStart", {}) + vim.api.nvim_create_user_command("CPD", "SupermavenStop", {}) - vim.g.copilot_filetypes = { - TelescopePrompt = false, - } - end + require("supermaven-nvim").setup({}) + + -- Disable on startup + vim.api.nvim_command("silent! SupermavenStop") + end, }, -- Auto-restore session when opening Neovim diff --git a/wallpapers/basicappleguy/FireLicked_Mac.heic b/wallpapers/basicappleguy/FireLicked_Mac.heic new file mode 100644 index 0000000..b1b45be Binary files /dev/null and b/wallpapers/basicappleguy/FireLicked_Mac.heic differ diff --git a/wallpapers/basicappleguy/MtHoodMac.heic b/wallpapers/basicappleguy/MtHoodMac.heic new file mode 100644 index 0000000..46f8db7 Binary files /dev/null and b/wallpapers/basicappleguy/MtHoodMac.heic differ diff --git a/wallpapers/basicappleguy/RanchoNight_6K_Dyn.heic b/wallpapers/basicappleguy/RanchoNight_6K_Dyn.heic new file mode 100644 index 0000000..e1aa1c4 Binary files /dev/null and b/wallpapers/basicappleguy/RanchoNight_6K_Dyn.heic differ diff --git a/wallpapers/basicappleguy/RanchoTwilight_T_Mac.heic b/wallpapers/basicappleguy/RanchoTwilight_T_Mac.heic new file mode 100644 index 0000000..6a10a44 Binary files /dev/null and b/wallpapers/basicappleguy/RanchoTwilight_T_Mac.heic differ diff --git a/wallpapers/Rancho_Cucamonga_Tree_6K.png b/wallpapers/basicappleguy/Rancho_Cucamonga_Tree_6K.png similarity index 100% rename from wallpapers/Rancho_Cucamonga_Tree_6K.png rename to wallpapers/basicappleguy/Rancho_Cucamonga_Tree_6K.png diff --git a/wallpapers/basicappleguy/Slide_Mac.heic b/wallpapers/basicappleguy/Slide_Mac.heic new file mode 100644 index 0000000..b08de31 Binary files /dev/null and b/wallpapers/basicappleguy/Slide_Mac.heic differ diff --git a/wallpapers/basicappleguy/Solar_Mac.heic b/wallpapers/basicappleguy/Solar_Mac.heic new file mode 100644 index 0000000..b97dbd8 Binary files /dev/null and b/wallpapers/basicappleguy/Solar_Mac.heic differ diff --git a/wallpapers/basicappleguy/Starfield+II+Mac.heic b/wallpapers/basicappleguy/Starfield+II+Mac.heic new file mode 100644 index 0000000..6f1b3f8 Binary files /dev/null and b/wallpapers/basicappleguy/Starfield+II+Mac.heic differ diff --git a/wallpapers/basicappleguy/TiGradient_Mac.heic b/wallpapers/basicappleguy/TiGradient_Mac.heic new file mode 100644 index 0000000..755dff3 Binary files /dev/null and b/wallpapers/basicappleguy/TiGradient_Mac.heic differ diff --git a/wallpapers/basicappleguy/Wave_Mac.heic b/wallpapers/basicappleguy/Wave_Mac.heic new file mode 100644 index 0000000..cea22e9 Binary files /dev/null and b/wallpapers/basicappleguy/Wave_Mac.heic differ diff --git a/wallpapers/basicappleguy/WavesPinkMac6K.png b/wallpapers/basicappleguy/WavesPinkMac6K.png new file mode 100644 index 0000000..fb1a292 Binary files /dev/null and b/wallpapers/basicappleguy/WavesPinkMac6K.png differ diff --git a/wallpapers/basicappleguy/WavesSpaceGreyMac6K.png b/wallpapers/basicappleguy/WavesSpaceGreyMac6K.png new file mode 100644 index 0000000..ca91e83 Binary files /dev/null and b/wallpapers/basicappleguy/WavesSpaceGreyMac6K.png differ diff --git a/wallpapers/WavesStarlightMac6K.png b/wallpapers/basicappleguy/WavesStarlightMac6K.png similarity index 100% rename from wallpapers/WavesStarlightMac6K.png rename to wallpapers/basicappleguy/WavesStarlightMac6K.png diff --git a/wallpapers/basicappleguy/Whirl_Mac.heic b/wallpapers/basicappleguy/Whirl_Mac.heic new file mode 100644 index 0000000..2ded559 Binary files /dev/null and b/wallpapers/basicappleguy/Whirl_Mac.heic differ