From f9985cd62a57d2e97e388f5e5cf07474d12c9aad Mon Sep 17 00:00:00 2001 From: juan Date: Thu, 15 Jul 2021 15:55:45 -0500 Subject: [PATCH] General fixes --- .gitignore | 1 + ...local.example => .gitconfig.local.example} | 2 - git/.gitignore | 1 + macos/.config/karabiner/karabiner.json | 462 +++++++++++------- macos/.config/skhd/skhdrc | 10 +- 5 files changed, 298 insertions(+), 178 deletions(-) rename git/{.gitignore.local.example => .gitconfig.local.example} (86%) diff --git a/.gitignore b/.gitignore index 7e5da8f..81366b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /zsh/antibody +/macos/.config/karabiner local.sh # Created by https://www.gitignore.io/api/emacs diff --git a/git/.gitignore.local.example b/git/.gitconfig.local.example similarity index 86% rename from git/.gitignore.local.example rename to git/.gitconfig.local.example index 0cc654f..4baefd6 100644 --- a/git/.gitignore.local.example +++ b/git/.gitconfig.local.example @@ -5,7 +5,5 @@ email = USER_EMAIL [credential] helper = CREDENTIAL_HELPER -[github] - user = USER_NAME # [url "git@github.com:"] # pushInsteadOf = https://github.com/ diff --git a/git/.gitignore b/git/.gitignore index 30f543b..328f7f3 100644 --- a/git/.gitignore +++ b/git/.gitignore @@ -1,3 +1,4 @@ +/.log _minted-* # Created by https://www.toptal.com/developers/gitignore/api/vim,linux,emacs,macos,windows,sublimetext,visualstudiocode diff --git a/macos/.config/karabiner/karabiner.json b/macos/.config/karabiner/karabiner.json index 6dfab8b..ddbca04 100644 --- a/macos/.config/karabiner/karabiner.json +++ b/macos/.config/karabiner/karabiner.json @@ -122,97 +122,121 @@ "from": { "key_code": "f1" }, - "to": { - "consumer_key_code": "display_brightness_decrement" - } + "to": [ + { + "consumer_key_code": "display_brightness_decrement" + } + ] }, { "from": { "key_code": "f2" }, - "to": { - "consumer_key_code": "display_brightness_increment" - } + "to": [ + { + "consumer_key_code": "display_brightness_increment" + } + ] }, { "from": { "key_code": "f3" }, - "to": { - "key_code": "mission_control" - } + "to": [ + { + "key_code": "mission_control" + } + ] }, { "from": { "key_code": "f4" }, - "to": { - "key_code": "launchpad" - } + "to": [ + { + "key_code": "launchpad" + } + ] }, { "from": { "key_code": "f5" }, - "to": { - "key_code": "illumination_decrement" - } + "to": [ + { + "key_code": "illumination_decrement" + } + ] }, { "from": { "key_code": "f6" }, - "to": { - "key_code": "illumination_increment" - } + "to": [ + { + "key_code": "illumination_increment" + } + ] }, { "from": { "key_code": "f7" }, - "to": { - "consumer_key_code": "rewind" - } + "to": [ + { + "consumer_key_code": "rewind" + } + ] }, { "from": { "key_code": "f8" }, - "to": { - "consumer_key_code": "play_or_pause" - } + "to": [ + { + "consumer_key_code": "play_or_pause" + } + ] }, { "from": { "key_code": "f9" }, - "to": { - "consumer_key_code": "fastforward" - } + "to": [ + { + "consumer_key_code": "fastforward" + } + ] }, { "from": { "key_code": "f10" }, - "to": { - "consumer_key_code": "mute" - } + "to": [ + { + "consumer_key_code": "mute" + } + ] }, { "from": { "key_code": "f11" }, - "to": { - "consumer_key_code": "volume_decrement" - } + "to": [ + { + "consumer_key_code": "volume_decrement" + } + ] }, { "from": { "key_code": "f12" }, - "to": { - "consumer_key_code": "volume_increment" - } + "to": [ + { + "consumer_key_code": "volume_increment" + } + ] } ], "name": "Default", @@ -225,22 +249,27 @@ "from": { "key_code": "backslash" }, - "to": { - "key_code": "delete_or_backspace" - } + "to": [ + { + "key_code": "delete_or_backspace" + } + ] }, { "from": { "key_code": "delete_or_backspace" }, - "to": { - "key_code": "backslash" - } + "to": [ + { + "key_code": "backslash" + } + ] } ], "virtual_hid_keyboard": { "caps_lock_delay_milliseconds": 0, "country_code": 0, + "indicate_sticky_modifier_keys_state": true, "keyboard_type": "ansi", "mouse_key_xy_scale": 100 } @@ -262,97 +291,121 @@ "from": { "key_code": "f1" }, - "to": { - "consumer_key_code": "display_brightness_decrement" - } + "to": [ + { + "consumer_key_code": "display_brightness_decrement" + } + ] }, { "from": { "key_code": "f2" }, - "to": { - "consumer_key_code": "display_brightness_increment" - } + "to": [ + { + "consumer_key_code": "display_brightness_increment" + } + ] }, { "from": { "key_code": "f3" }, - "to": { - "key_code": "mission_control" - } + "to": [ + { + "key_code": "mission_control" + } + ] }, { "from": { "key_code": "f4" }, - "to": { - "key_code": "launchpad" - } + "to": [ + { + "key_code": "launchpad" + } + ] }, { "from": { "key_code": "f5" }, - "to": { - "key_code": "illumination_decrement" - } + "to": [ + { + "key_code": "illumination_decrement" + } + ] }, { "from": { "key_code": "f6" }, - "to": { - "key_code": "illumination_increment" - } + "to": [ + { + "key_code": "illumination_increment" + } + ] }, { "from": { "key_code": "f7" }, - "to": { - "consumer_key_code": "rewind" - } + "to": [ + { + "consumer_key_code": "rewind" + } + ] }, { "from": { "key_code": "f8" }, - "to": { - "consumer_key_code": "play_or_pause" - } + "to": [ + { + "consumer_key_code": "play_or_pause" + } + ] }, { "from": { "key_code": "f9" }, - "to": { - "consumer_key_code": "fastforward" - } + "to": [ + { + "consumer_key_code": "fastforward" + } + ] }, { "from": { "key_code": "f10" }, - "to": { - "consumer_key_code": "mute" - } + "to": [ + { + "consumer_key_code": "mute" + } + ] }, { "from": { "key_code": "f11" }, - "to": { - "consumer_key_code": "volume_decrement" - } + "to": [ + { + "consumer_key_code": "volume_decrement" + } + ] }, { "from": { "key_code": "f12" }, - "to": { - "consumer_key_code": "volume_increment" - } + "to": [ + { + "consumer_key_code": "volume_increment" + } + ] } ], "name": "Ergodox", @@ -365,30 +418,37 @@ "from": { "key_code": "f16" }, - "to": { - "consumer_key_code": "scan_previous_track" - } + "to": [ + { + "consumer_key_code": "scan_previous_track" + } + ] }, { "from": { "key_code": "f17" }, - "to": { - "consumer_key_code": "play_or_pause" - } + "to": [ + { + "consumer_key_code": "play_or_pause" + } + ] }, { "from": { "key_code": "f18" }, - "to": { - "consumer_key_code": "scan_next_track" - } + "to": [ + { + "consumer_key_code": "scan_next_track" + } + ] } ], "virtual_hid_keyboard": { "caps_lock_delay_milliseconds": 0, "country_code": 0, + "indicate_sticky_modifier_keys_state": true, "keyboard_type": "ansi", "mouse_key_xy_scale": 100 } @@ -510,97 +570,121 @@ "from": { "key_code": "f1" }, - "to": { - "consumer_key_code": "display_brightness_decrement" - } + "to": [ + { + "consumer_key_code": "display_brightness_decrement" + } + ] }, { "from": { "key_code": "f2" }, - "to": { - "consumer_key_code": "display_brightness_increment" - } + "to": [ + { + "consumer_key_code": "display_brightness_increment" + } + ] }, { "from": { "key_code": "f3" }, - "to": { - "key_code": "mission_control" - } + "to": [ + { + "key_code": "mission_control" + } + ] }, { "from": { "key_code": "f4" }, - "to": { - "key_code": "launchpad" - } + "to": [ + { + "key_code": "launchpad" + } + ] }, { "from": { "key_code": "f5" }, - "to": { - "key_code": "illumination_decrement" - } + "to": [ + { + "key_code": "illumination_decrement" + } + ] }, { "from": { "key_code": "f6" }, - "to": { - "key_code": "illumination_increment" - } + "to": [ + { + "key_code": "illumination_increment" + } + ] }, { "from": { "key_code": "f7" }, - "to": { - "consumer_key_code": "rewind" - } + "to": [ + { + "consumer_key_code": "rewind" + } + ] }, { "from": { "key_code": "f8" }, - "to": { - "consumer_key_code": "play_or_pause" - } + "to": [ + { + "consumer_key_code": "play_or_pause" + } + ] }, { "from": { "key_code": "f9" }, - "to": { - "consumer_key_code": "fastforward" - } + "to": [ + { + "consumer_key_code": "fastforward" + } + ] }, { "from": { "key_code": "f10" }, - "to": { - "consumer_key_code": "mute" - } + "to": [ + { + "consumer_key_code": "mute" + } + ] }, { "from": { "key_code": "f11" }, - "to": { - "consumer_key_code": "volume_decrement" - } + "to": [ + { + "consumer_key_code": "volume_decrement" + } + ] }, { "from": { "key_code": "f12" }, - "to": { - "consumer_key_code": "volume_increment" - } + "to": [ + { + "consumer_key_code": "volume_increment" + } + ] } ], "name": "HHKB", @@ -613,14 +697,17 @@ "from": { "key_code": "escape" }, - "to": { - "key_code": "grave_accent_and_tilde" - } + "to": [ + { + "key_code": "grave_accent_and_tilde" + } + ] } ], "virtual_hid_keyboard": { "caps_lock_delay_milliseconds": 0, "country_code": 0, + "indicate_sticky_modifier_keys_state": true, "keyboard_type": "ansi", "mouse_key_xy_scale": 100 } @@ -742,97 +829,121 @@ "from": { "key_code": "f1" }, - "to": { - "consumer_key_code": "display_brightness_decrement" - } + "to": [ + { + "consumer_key_code": "display_brightness_decrement" + } + ] }, { "from": { "key_code": "f2" }, - "to": { - "consumer_key_code": "display_brightness_increment" - } + "to": [ + { + "consumer_key_code": "display_brightness_increment" + } + ] }, { "from": { "key_code": "f3" }, - "to": { - "key_code": "mission_control" - } + "to": [ + { + "key_code": "mission_control" + } + ] }, { "from": { "key_code": "f4" }, - "to": { - "key_code": "launchpad" - } + "to": [ + { + "key_code": "launchpad" + } + ] }, { "from": { "key_code": "f5" }, - "to": { - "key_code": "illumination_decrement" - } + "to": [ + { + "key_code": "illumination_decrement" + } + ] }, { "from": { "key_code": "f6" }, - "to": { - "key_code": "illumination_increment" - } + "to": [ + { + "key_code": "illumination_increment" + } + ] }, { "from": { "key_code": "f7" }, - "to": { - "consumer_key_code": "rewind" - } + "to": [ + { + "consumer_key_code": "rewind" + } + ] }, { "from": { "key_code": "f8" }, - "to": { - "consumer_key_code": "play_or_pause" - } + "to": [ + { + "consumer_key_code": "play_or_pause" + } + ] }, { "from": { "key_code": "f9" }, - "to": { - "consumer_key_code": "fastforward" - } + "to": [ + { + "consumer_key_code": "fastforward" + } + ] }, { "from": { "key_code": "f10" }, - "to": { - "consumer_key_code": "mute" - } + "to": [ + { + "consumer_key_code": "mute" + } + ] }, { "from": { "key_code": "f11" }, - "to": { - "consumer_key_code": "volume_decrement" - } + "to": [ + { + "consumer_key_code": "volume_decrement" + } + ] }, { "from": { "key_code": "f12" }, - "to": { - "consumer_key_code": "volume_increment" - } + "to": [ + { + "consumer_key_code": "volume_increment" + } + ] } ], "name": "Model M", @@ -845,33 +956,40 @@ "from": { "key_code": "backslash" }, - "to": { - "key_code": "delete_or_backspace" - } + "to": [ + { + "key_code": "delete_or_backspace" + } + ] }, { "from": { "key_code": "delete_or_backspace" }, - "to": { - "key_code": "backslash" - } + "to": [ + { + "key_code": "backslash" + } + ] }, { "from": { "key_code": "left_option" }, - "to": { - "key_code": "left_command" - } + "to": [ + { + "key_code": "left_command" + } + ] } ], "virtual_hid_keyboard": { "caps_lock_delay_milliseconds": 0, "country_code": 0, + "indicate_sticky_modifier_keys_state": true, "keyboard_type": "ansi", "mouse_key_xy_scale": 100 } } ] -} +} \ No newline at end of file diff --git a/macos/.config/skhd/skhdrc b/macos/.config/skhd/skhdrc index 98171c9..8235e52 100755 --- a/macos/.config/skhd/skhdrc +++ b/macos/.config/skhd/skhdrc @@ -25,10 +25,12 @@ cmd - j : yabai -m window --focus south || yabai -m window --focus first cmd - k : yabai -m window --focus north || yabai -m window --focus first cmd - l : yabai -m window --focus east || yabai -m window --focus first -ctrl + cmd - h : yabai -m window --warp west -ctrl + cmd - j : yabai -m window --warp south -ctrl + cmd - k : yabai -m window --warp north -ctrl + cmd - l : yabai -m window --warp east +ctrl + cmd - h : yabai -m window --resize left:-24:0 || yabai -m window --resize right:-24:0 +ctrl + cmd - j : yabai -m window --resize top:0:24 || yabai -m window --resize bottom:0:24 +ctrl + cmd - k : yabai -m window --resize top:0:-24 || yabai -m window --resize bottom:0:-24 +ctrl + cmd - l : yabai -m window --resize left:24:0 || yabai -m window --resize right:24:0 + +shift + cmd - space : yabai -m window --toggle split shift + cmd - h : yabai -m window --swap west shift + cmd - j : yabai -m window --swap south