Compare commits

..

No commits in common. "85a98b8019a5459b606302e731a700d6f3ba5f52" and "5b2bf3f273a7e26280390dc1751c29a56c65b273" have entirely different histories.

3 changed files with 967 additions and 1067 deletions

View File

@ -1,6 +1,5 @@
{ {
"global": { "global": {
"ask_for_confirmation_before_quitting": true,
"check_for_updates_on_startup": true, "check_for_updates_on_startup": true,
"show_in_menu_bar": false, "show_in_menu_bar": false,
"show_profile_name_in_menu_bar": false, "show_profile_name_in_menu_bar": false,
@ -24,12 +23,8 @@
"from": { "from": {
"key_code": "h", "key_code": "h",
"modifiers": { "modifiers": {
"mandatory": [ "mandatory": ["right_command"],
"right_command" "optional": ["any"]
],
"optional": [
"any"
]
} }
}, },
"to": [ "to": [
@ -43,12 +38,8 @@
"from": { "from": {
"key_code": "j", "key_code": "j",
"modifiers": { "modifiers": {
"mandatory": [ "mandatory": ["right_command"],
"right_command" "optional": ["any"]
],
"optional": [
"any"
]
} }
}, },
"to": [ "to": [
@ -62,12 +53,8 @@
"from": { "from": {
"key_code": "k", "key_code": "k",
"modifiers": { "modifiers": {
"mandatory": [ "mandatory": ["right_command"],
"right_command" "optional": ["any"]
],
"optional": [
"any"
]
} }
}, },
"to": [ "to": [
@ -81,12 +68,8 @@
"from": { "from": {
"key_code": "l", "key_code": "l",
"modifiers": { "modifiers": {
"mandatory": [ "mandatory": ["right_command"],
"right_command" "optional": ["any"]
],
"optional": [
"any"
]
} }
}, },
"to": [ "to": [
@ -105,13 +88,8 @@
"from": { "from": {
"key_code": "j", "key_code": "j",
"modifiers": { "modifiers": {
"mandatory": [ "mandatory": ["left_control", "left_shift"],
"left_control", "optional": ["any"]
"left_shift"
],
"optional": [
"any"
]
} }
}, },
"to": [ "to": [
@ -127,13 +105,8 @@
"from": { "from": {
"key_code": "k", "key_code": "k",
"modifiers": { "modifiers": {
"mandatory": [ "mandatory": ["left_control", "left_shift"],
"left_control", "optional": ["any"]
"left_shift"
],
"optional": [
"any"
]
} }
}, },
"to": [ "to": [
@ -149,12 +122,8 @@
"from": { "from": {
"key_code": "h", "key_code": "h",
"modifiers": { "modifiers": {
"mandatory": [ "mandatory": ["fn"],
"fn" "optional": ["any"]
],
"optional": [
"any"
]
} }
}, },
"to": [ "to": [
@ -170,12 +139,8 @@
"from": { "from": {
"key_code": "l", "key_code": "l",
"modifiers": { "modifiers": {
"mandatory": [ "mandatory": ["fn"],
"fn" "optional": ["any"]
],
"optional": [
"any"
]
} }
}, },
"to": [ "to": [
@ -191,13 +156,8 @@
"from": { "from": {
"key_code": "u", "key_code": "u",
"modifiers": { "modifiers": {
"mandatory": [ "mandatory": ["left_option", "left_shift"],
"left_option", "optional": ["any"]
"left_shift"
],
"optional": [
"any"
]
} }
}, },
"to": [ "to": [
@ -211,13 +171,8 @@
"from": { "from": {
"key_code": "o", "key_code": "o",
"modifiers": { "modifiers": {
"mandatory": [ "mandatory": ["left_option", "left_shift"],
"left_option", "optional": ["any"]
"left_shift"
],
"optional": [
"any"
]
} }
}, },
"to": [ "to": [
@ -231,13 +186,8 @@
"from": { "from": {
"key_code": "h", "key_code": "h",
"modifiers": { "modifiers": {
"mandatory": [ "mandatory": ["left_option", "left_shift"],
"left_option", "optional": ["any"]
"left_shift"
],
"optional": [
"any"
]
} }
}, },
"to": [ "to": [
@ -253,13 +203,8 @@
"from": { "from": {
"key_code": "j", "key_code": "j",
"modifiers": { "modifiers": {
"mandatory": [ "mandatory": ["left_option", "left_shift"],
"left_option", "optional": ["any"]
"left_shift"
],
"optional": [
"any"
]
} }
}, },
"to": [ "to": [
@ -275,13 +220,8 @@
"from": { "from": {
"key_code": "k", "key_code": "k",
"modifiers": { "modifiers": {
"mandatory": [ "mandatory": ["left_option", "left_shift"],
"left_option", "optional": ["any"]
"left_shift"
],
"optional": [
"any"
]
} }
}, },
"to": [ "to": [
@ -297,13 +237,8 @@
"from": { "from": {
"key_code": "l", "key_code": "l",
"modifiers": { "modifiers": {
"mandatory": [ "mandatory": ["left_option", "left_shift"],
"left_option", "optional": ["any"]
"left_shift"
],
"optional": [
"any"
]
} }
}, },
"to": [ "to": [
@ -319,13 +254,8 @@
"from": { "from": {
"key_code": "q", "key_code": "q",
"modifiers": { "modifiers": {
"mandatory": [ "mandatory": ["left_option", "left_shift"],
"left_option", "optional": ["any"]
"left_shift"
],
"optional": [
"any"
]
} }
}, },
"to": [ "to": [
@ -339,13 +269,8 @@
"from": { "from": {
"key_code": "e", "key_code": "e",
"modifiers": { "modifiers": {
"mandatory": [ "mandatory": ["left_option", "left_shift"],
"left_option", "optional": ["any"]
"left_shift"
],
"optional": [
"any"
]
} }
}, },
"to": [ "to": [
@ -665,16 +590,6 @@
"ignore": false, "ignore": false,
"manipulate_caps_lock_led": true, "manipulate_caps_lock_led": true,
"simple_modifications": [ "simple_modifications": [
{
"from": {
"key_code": "escape"
},
"to": [
{
"key_code": "grave_accent_and_tilde"
}
]
},
{ {
"from": { "from": {
"key_code": "left_command" "key_code": "left_command"
@ -694,6 +609,16 @@
"key_code": "right_command" "key_code": "right_command"
} }
] ]
},
{
"from": {
"key_code": "escape"
},
"to": [
{
"key_code": "grave_accent_and_tilde"
}
]
} }
], ],
"treat_as_built_in_keyboard": false "treat_as_built_in_keyboard": false
@ -851,31 +776,6 @@
} }
], ],
"treat_as_built_in_keyboard": false "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": 1452
},
"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": [ "fn_function_keys": [

View File

@ -120,19 +120,19 @@
], ],
[ [
"KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_F1",
"KC_TRNS", "KC_F2",
"KC_TRNS", "KC_F3",
"KC_TRNS", "KC_F4",
"BL_DEC", "BL_DEC",
"BL_INC", "BL_INC",
"KC_MPRV", "KC_MPRV",
"KC_MPLY", "KC_MPLY",
"KC_MNXT", "KC_MNXT",
"KC_F10",
"KC_F11",
"KC_F12",
"KC_TRNS", "KC_TRNS",
"KC_TRNS",
"KC_TRNS",
"KC_PSCR",
"KC_NO", "KC_NO",
"RGB_TOG", "RGB_TOG",
"KC_TRNS", "KC_TRNS",
@ -264,7 +264,7 @@
"KC_RBRC", "KC_RBRC",
"KC_BSLS", "KC_BSLS",
"KC_NO", "KC_NO",
"KC_PGDN", "KC_PGUP",
"KC_ESC", "KC_ESC",
"KC_A", "KC_A",
"KC_S", "KC_S",
@ -328,7 +328,7 @@
"KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_TRNS",
"KC_PSCR", "KC_TRNS",
"KC_NO", "KC_NO",
"RGB_TOG", "RGB_TOG",
"KC_TRNS", "KC_TRNS",

View File

@ -342,7 +342,7 @@ autocmd! CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=fals
let g:neoformat_try_formatprg = 1 let g:neoformat_try_formatprg = 1
let g:neoformat_basic_format_trim = 1 let g:neoformat_basic_format_trim = 1
let g:neoformat_only_msg_on_error = 1 let g:neoformat_only_msg_on_error = 1
" autocmd BufWritePre * silent! undojoin | Neoformat autocmd BufWritePre * silent! undojoin | Neoformat
let g:neoformat_python_black = { let g:neoformat_python_black = {
\ 'exe': 'black', \ 'exe': 'black',
\ 'stdin': 1, \ 'stdin': 1,
@ -611,7 +611,7 @@ autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo\|q!<CR>
autocmd BufRead,BufNewFile *.yaml let g:indentLine_enabled = 1 autocmd BufRead,BufNewFile *.yaml let g:indentLine_enabled = 1
autocmd BufRead,BufNewFile *.yaml let g:indentLine_char = '⦙' autocmd BufRead,BufNewFile *.yaml let g:indentLine_char = '⦙'
au BufRead,BufNewFile *.yaml,*.yml if search('hosts:\|tasks:', 'nw') | set ft=yaml.ansible | endif au BufRead,BufNewFile *.yaml,*.yml if search('hosts:\|tasks:', 'nw') | set ft=yaml.ansible | endif
" autocmd BufWritePre * silent! undojoin | Neoformat prettier autocmd BufWritePre * silent! undojoin | Neoformat prettier
" Go " Go
autocmd BufRead *.go set noexpandtab autocmd BufRead *.go set noexpandtab