Browse Source

General fixes

master
juan 4 years ago
parent
commit
f9985cd62a
5 changed files with 298 additions and 178 deletions
  1. +1
    -0
      .gitignore
  2. +0
    -2
      git/.gitconfig.local.example
  3. +1
    -0
      git/.gitignore
  4. +290
    -172
      macos/.config/karabiner/karabiner.json
  5. +6
    -4
      macos/.config/skhd/skhdrc

+ 1
- 0
.gitignore View File

@ -1,4 +1,5 @@
/zsh/antibody /zsh/antibody
/macos/.config/karabiner
local.sh local.sh
# Created by https://www.gitignore.io/api/emacs # Created by https://www.gitignore.io/api/emacs

git/.gitignore.local.example → git/.gitconfig.local.example View File

@ -5,7 +5,5 @@
email = USER_EMAIL email = USER_EMAIL
[credential] [credential]
helper = CREDENTIAL_HELPER helper = CREDENTIAL_HELPER
[github]
user = USER_NAME
# [url "git@github.com:"] # [url "git@github.com:"]
# pushInsteadOf = https://github.com/ # pushInsteadOf = https://github.com/

+ 1
- 0
git/.gitignore View File

@ -1,3 +1,4 @@
/.log
_minted-* _minted-*
# Created by https://www.toptal.com/developers/gitignore/api/vim,linux,emacs,macos,windows,sublimetext,visualstudiocode # Created by https://www.toptal.com/developers/gitignore/api/vim,linux,emacs,macos,windows,sublimetext,visualstudiocode

+ 290
- 172
macos/.config/karabiner/karabiner.json View File

@ -122,97 +122,121 @@
"from": { "from": {
"key_code": "f1" "key_code": "f1"
}, },
"to": {
"consumer_key_code": "display_brightness_decrement"
}
"to": [
{
"consumer_key_code": "display_brightness_decrement"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f2" "key_code": "f2"
}, },
"to": {
"consumer_key_code": "display_brightness_increment"
}
"to": [
{
"consumer_key_code": "display_brightness_increment"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f3" "key_code": "f3"
}, },
"to": {
"key_code": "mission_control"
}
"to": [
{
"key_code": "mission_control"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f4" "key_code": "f4"
}, },
"to": {
"key_code": "launchpad"
}
"to": [
{
"key_code": "launchpad"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f5" "key_code": "f5"
}, },
"to": {
"key_code": "illumination_decrement"
}
"to": [
{
"key_code": "illumination_decrement"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f6" "key_code": "f6"
}, },
"to": {
"key_code": "illumination_increment"
}
"to": [
{
"key_code": "illumination_increment"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f7" "key_code": "f7"
}, },
"to": {
"consumer_key_code": "rewind"
}
"to": [
{
"consumer_key_code": "rewind"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f8" "key_code": "f8"
}, },
"to": {
"consumer_key_code": "play_or_pause"
}
"to": [
{
"consumer_key_code": "play_or_pause"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f9" "key_code": "f9"
}, },
"to": {
"consumer_key_code": "fastforward"
}
"to": [
{
"consumer_key_code": "fastforward"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f10" "key_code": "f10"
}, },
"to": {
"consumer_key_code": "mute"
}
"to": [
{
"consumer_key_code": "mute"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f11" "key_code": "f11"
}, },
"to": {
"consumer_key_code": "volume_decrement"
}
"to": [
{
"consumer_key_code": "volume_decrement"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f12" "key_code": "f12"
}, },
"to": {
"consumer_key_code": "volume_increment"
}
"to": [
{
"consumer_key_code": "volume_increment"
}
]
} }
], ],
"name": "Default", "name": "Default",
@ -225,22 +249,27 @@
"from": { "from": {
"key_code": "backslash" "key_code": "backslash"
}, },
"to": {
"key_code": "delete_or_backspace"
}
"to": [
{
"key_code": "delete_or_backspace"
}
]
}, },
{ {
"from": { "from": {
"key_code": "delete_or_backspace" "key_code": "delete_or_backspace"
}, },
"to": {
"key_code": "backslash"
}
"to": [
{
"key_code": "backslash"
}
]
} }
], ],
"virtual_hid_keyboard": { "virtual_hid_keyboard": {
"caps_lock_delay_milliseconds": 0, "caps_lock_delay_milliseconds": 0,
"country_code": 0, "country_code": 0,
"indicate_sticky_modifier_keys_state": true,
"keyboard_type": "ansi", "keyboard_type": "ansi",
"mouse_key_xy_scale": 100 "mouse_key_xy_scale": 100
} }
@ -262,97 +291,121 @@
"from": { "from": {
"key_code": "f1" "key_code": "f1"
}, },
"to": {
"consumer_key_code": "display_brightness_decrement"
}
"to": [
{
"consumer_key_code": "display_brightness_decrement"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f2" "key_code": "f2"
}, },
"to": {
"consumer_key_code": "display_brightness_increment"
}
"to": [
{
"consumer_key_code": "display_brightness_increment"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f3" "key_code": "f3"
}, },
"to": {
"key_code": "mission_control"
}
"to": [
{
"key_code": "mission_control"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f4" "key_code": "f4"
}, },
"to": {
"key_code": "launchpad"
}
"to": [
{
"key_code": "launchpad"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f5" "key_code": "f5"
}, },
"to": {
"key_code": "illumination_decrement"
}
"to": [
{
"key_code": "illumination_decrement"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f6" "key_code": "f6"
}, },
"to": {
"key_code": "illumination_increment"
}
"to": [
{
"key_code": "illumination_increment"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f7" "key_code": "f7"
}, },
"to": {
"consumer_key_code": "rewind"
}
"to": [
{
"consumer_key_code": "rewind"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f8" "key_code": "f8"
}, },
"to": {
"consumer_key_code": "play_or_pause"
}
"to": [
{
"consumer_key_code": "play_or_pause"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f9" "key_code": "f9"
}, },
"to": {
"consumer_key_code": "fastforward"
}
"to": [
{
"consumer_key_code": "fastforward"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f10" "key_code": "f10"
}, },
"to": {
"consumer_key_code": "mute"
}
"to": [
{
"consumer_key_code": "mute"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f11" "key_code": "f11"
}, },
"to": {
"consumer_key_code": "volume_decrement"
}
"to": [
{
"consumer_key_code": "volume_decrement"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f12" "key_code": "f12"
}, },
"to": {
"consumer_key_code": "volume_increment"
}
"to": [
{
"consumer_key_code": "volume_increment"
}
]
} }
], ],
"name": "Ergodox", "name": "Ergodox",
@ -365,30 +418,37 @@
"from": { "from": {
"key_code": "f16" "key_code": "f16"
}, },
"to": {
"consumer_key_code": "scan_previous_track"
}
"to": [
{
"consumer_key_code": "scan_previous_track"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f17" "key_code": "f17"
}, },
"to": {
"consumer_key_code": "play_or_pause"
}
"to": [
{
"consumer_key_code": "play_or_pause"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f18" "key_code": "f18"
}, },
"to": {
"consumer_key_code": "scan_next_track"
}
"to": [
{
"consumer_key_code": "scan_next_track"
}
]
} }
], ],
"virtual_hid_keyboard": { "virtual_hid_keyboard": {
"caps_lock_delay_milliseconds": 0, "caps_lock_delay_milliseconds": 0,
"country_code": 0, "country_code": 0,
"indicate_sticky_modifier_keys_state": true,
"keyboard_type": "ansi", "keyboard_type": "ansi",
"mouse_key_xy_scale": 100 "mouse_key_xy_scale": 100
} }
@ -510,97 +570,121 @@
"from": { "from": {
"key_code": "f1" "key_code": "f1"
}, },
"to": {
"consumer_key_code": "display_brightness_decrement"
}
"to": [
{
"consumer_key_code": "display_brightness_decrement"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f2" "key_code": "f2"
}, },
"to": {
"consumer_key_code": "display_brightness_increment"
}
"to": [
{
"consumer_key_code": "display_brightness_increment"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f3" "key_code": "f3"
}, },
"to": {
"key_code": "mission_control"
}
"to": [
{
"key_code": "mission_control"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f4" "key_code": "f4"
}, },
"to": {
"key_code": "launchpad"
}
"to": [
{
"key_code": "launchpad"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f5" "key_code": "f5"
}, },
"to": {
"key_code": "illumination_decrement"
}
"to": [
{
"key_code": "illumination_decrement"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f6" "key_code": "f6"
}, },
"to": {
"key_code": "illumination_increment"
}
"to": [
{
"key_code": "illumination_increment"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f7" "key_code": "f7"
}, },
"to": {
"consumer_key_code": "rewind"
}
"to": [
{
"consumer_key_code": "rewind"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f8" "key_code": "f8"
}, },
"to": {
"consumer_key_code": "play_or_pause"
}
"to": [
{
"consumer_key_code": "play_or_pause"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f9" "key_code": "f9"
}, },
"to": {
"consumer_key_code": "fastforward"
}
"to": [
{
"consumer_key_code": "fastforward"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f10" "key_code": "f10"
}, },
"to": {
"consumer_key_code": "mute"
}
"to": [
{
"consumer_key_code": "mute"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f11" "key_code": "f11"
}, },
"to": {
"consumer_key_code": "volume_decrement"
}
"to": [
{
"consumer_key_code": "volume_decrement"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f12" "key_code": "f12"
}, },
"to": {
"consumer_key_code": "volume_increment"
}
"to": [
{
"consumer_key_code": "volume_increment"
}
]
} }
], ],
"name": "HHKB", "name": "HHKB",
@ -613,14 +697,17 @@
"from": { "from": {
"key_code": "escape" "key_code": "escape"
}, },
"to": {
"key_code": "grave_accent_and_tilde"
}
"to": [
{
"key_code": "grave_accent_and_tilde"
}
]
} }
], ],
"virtual_hid_keyboard": { "virtual_hid_keyboard": {
"caps_lock_delay_milliseconds": 0, "caps_lock_delay_milliseconds": 0,
"country_code": 0, "country_code": 0,
"indicate_sticky_modifier_keys_state": true,
"keyboard_type": "ansi", "keyboard_type": "ansi",
"mouse_key_xy_scale": 100 "mouse_key_xy_scale": 100
} }
@ -742,97 +829,121 @@
"from": { "from": {
"key_code": "f1" "key_code": "f1"
}, },
"to": {
"consumer_key_code": "display_brightness_decrement"
}
"to": [
{
"consumer_key_code": "display_brightness_decrement"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f2" "key_code": "f2"
}, },
"to": {
"consumer_key_code": "display_brightness_increment"
}
"to": [
{
"consumer_key_code": "display_brightness_increment"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f3" "key_code": "f3"
}, },
"to": {
"key_code": "mission_control"
}
"to": [
{
"key_code": "mission_control"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f4" "key_code": "f4"
}, },
"to": {
"key_code": "launchpad"
}
"to": [
{
"key_code": "launchpad"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f5" "key_code": "f5"
}, },
"to": {
"key_code": "illumination_decrement"
}
"to": [
{
"key_code": "illumination_decrement"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f6" "key_code": "f6"
}, },
"to": {
"key_code": "illumination_increment"
}
"to": [
{
"key_code": "illumination_increment"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f7" "key_code": "f7"
}, },
"to": {
"consumer_key_code": "rewind"
}
"to": [
{
"consumer_key_code": "rewind"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f8" "key_code": "f8"
}, },
"to": {
"consumer_key_code": "play_or_pause"
}
"to": [
{
"consumer_key_code": "play_or_pause"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f9" "key_code": "f9"
}, },
"to": {
"consumer_key_code": "fastforward"
}
"to": [
{
"consumer_key_code": "fastforward"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f10" "key_code": "f10"
}, },
"to": {
"consumer_key_code": "mute"
}
"to": [
{
"consumer_key_code": "mute"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f11" "key_code": "f11"
}, },
"to": {
"consumer_key_code": "volume_decrement"
}
"to": [
{
"consumer_key_code": "volume_decrement"
}
]
}, },
{ {
"from": { "from": {
"key_code": "f12" "key_code": "f12"
}, },
"to": {
"consumer_key_code": "volume_increment"
}
"to": [
{
"consumer_key_code": "volume_increment"
}
]
} }
], ],
"name": "Model M", "name": "Model M",
@ -845,33 +956,40 @@
"from": { "from": {
"key_code": "backslash" "key_code": "backslash"
}, },
"to": {
"key_code": "delete_or_backspace"
}
"to": [
{
"key_code": "delete_or_backspace"
}
]
}, },
{ {
"from": { "from": {
"key_code": "delete_or_backspace" "key_code": "delete_or_backspace"
}, },
"to": {
"key_code": "backslash"
}
"to": [
{
"key_code": "backslash"
}
]
}, },
{ {
"from": { "from": {
"key_code": "left_option" "key_code": "left_option"
}, },
"to": {
"key_code": "left_command"
}
"to": [
{
"key_code": "left_command"
}
]
} }
], ],
"virtual_hid_keyboard": { "virtual_hid_keyboard": {
"caps_lock_delay_milliseconds": 0, "caps_lock_delay_milliseconds": 0,
"country_code": 0, "country_code": 0,
"indicate_sticky_modifier_keys_state": true,
"keyboard_type": "ansi", "keyboard_type": "ansi",
"mouse_key_xy_scale": 100 "mouse_key_xy_scale": 100
} }
} }
] ]
}
}

+ 6
- 4
macos/.config/skhd/skhdrc View File

@ -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 - k : yabai -m window --focus north || yabai -m window --focus first
cmd - l : yabai -m window --focus east || 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 - h : yabai -m window --swap west
shift + cmd - j : yabai -m window --swap south shift + cmd - j : yabai -m window --swap south

Loading…
Cancel
Save