diff --git a/dotfiles/home/.config/karabiner/karabiner.json b/dotfiles/home/.config/karabiner/karabiner.json index dec8f9d..6477e91 100644 --- a/dotfiles/home/.config/karabiner/karabiner.json +++ b/dotfiles/home/.config/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": true, - "unsafe_ui": false - }, + "global": { "show_profile_name_in_menu_bar": true }, "profiles": [ { "complex_modifications": { - "parameters": { - "basic.simultaneous_threshold_milliseconds": 50, - "basic.to_delayed_action_delay_milliseconds": 500, - "basic.to_if_alone_timeout_milliseconds": 1000, - "basic.to_if_held_down_threshold_milliseconds": 500, - "mouse_motion_to_scroll.speed": 100 - }, "rules": [ { "description": "edit shortcut", @@ -38,18 +25,12 @@ ], "from": { "key_code": "w", - "modifiers": { - "mandatory": [ - "left_control" - ] - } + "modifiers": { "mandatory": ["left_control"] } }, "to": [ { "key_code": "w", - "modifiers": [ - "left_command" - ] + "modifiers": ["left_command"] } ], "type": "basic" @@ -72,18 +53,12 @@ ], "from": { "key_code": "f", - "modifiers": { - "mandatory": [ - "left_control" - ] - } + "modifiers": { "mandatory": ["left_control"] } }, "to": [ { "key_code": "f", - "modifiers": [ - "left_command" - ] + "modifiers": ["left_command"] } ], "type": "basic" @@ -106,18 +81,12 @@ ], "from": { "key_code": "z", - "modifiers": { - "mandatory": [ - "left_control" - ] - } + "modifiers": { "mandatory": ["left_control"] } }, "to": [ { "key_code": "z", - "modifiers": [ - "left_command" - ] + "modifiers": ["left_command"] } ], "type": "basic" @@ -140,20 +109,12 @@ ], "from": { "key_code": "z", - "modifiers": { - "mandatory": [ - "left_control", - "left_shift" - ] - } + "modifiers": { "mandatory": ["left_control", "left_shift"] } }, "to": [ { "key_code": "z", - "modifiers": [ - "left_command", - "left_shift" - ] + "modifiers": ["left_command", "left_shift"] } ], "type": "basic" @@ -176,18 +137,12 @@ ], "from": { "key_code": "a", - "modifiers": { - "mandatory": [ - "left_control" - ] - } + "modifiers": { "mandatory": ["left_control"] } }, "to": [ { "key_code": "a", - "modifiers": [ - "left_command" - ] + "modifiers": ["left_command"] } ], "type": "basic" @@ -210,18 +165,12 @@ ], "from": { "key_code": "x", - "modifiers": { - "mandatory": [ - "left_control" - ] - } + "modifiers": { "mandatory": ["left_control"] } }, "to": [ { "key_code": "x", - "modifiers": [ - "left_command" - ] + "modifiers": ["left_command"] } ], "type": "basic" @@ -244,18 +193,12 @@ ], "from": { "key_code": "v", - "modifiers": { - "mandatory": [ - "left_control" - ] - } + "modifiers": { "mandatory": ["left_control"] } }, "to": [ { "key_code": "v", - "modifiers": [ - "left_command" - ] + "modifiers": ["left_command"] } ], "type": "basic" @@ -278,18 +221,12 @@ ], "from": { "key_code": "c", - "modifiers": { - "mandatory": [ - "left_control" - ] - } + "modifiers": { "mandatory": ["left_control"] } }, "to": [ { "key_code": "c", - "modifiers": [ - "left_command" - ] + "modifiers": ["left_command"] } ], "type": "basic" @@ -310,18 +247,12 @@ ], "from": { "key_code": "a", - "modifiers": { - "mandatory": [ - "control" - ] - } + "modifiers": { "mandatory": ["control"] } }, "to": [ { "key_code": "a", - "modifiers": [ - "left_command" - ] + "modifiers": ["left_command"] } ], "type": "basic" @@ -337,18 +268,12 @@ ], "from": { "key_code": "f", - "modifiers": { - "mandatory": [ - "control" - ] - } + "modifiers": { "mandatory": ["control"] } }, "to": [ { "key_code": "f", - "modifiers": [ - "left_command" - ] + "modifiers": ["left_command"] } ], "type": "basic" @@ -361,33 +286,17 @@ { "from": { "key_code": "return_or_enter", - "modifiers": { - "mandatory": [ - "left_command" - ] - } + "modifiers": { "mandatory": ["left_command"] } }, - "to": [ - { - "shell_command": "open -a alacritty" - } - ], + "to": [{ "shell_command": "open -a alacritty" }], "type": "basic" }, { "from": { "key_code": "e", - "modifiers": { - "mandatory": [ - "left_command" - ] - } + "modifiers": { "mandatory": ["left_command"] } }, - "to": [ - { - "shell_command": "open -a 'Finder.app'" - } - ], + "to": [{ "shell_command": "open -a 'Finder.app'" }], "type": "basic" } ] @@ -398,18 +307,12 @@ { "from": { "key_code": "tab", - "modifiers": { - "mandatory": [ - "left_command" - ] - } + "modifiers": { "mandatory": ["left_command"] } }, "to": [ { "key_code": "mission_control", - "modifiers": [ - "any" - ] + "modifiers": ["any"] } ], "type": "basic" @@ -417,18 +320,12 @@ { "from": { "key_code": "tab", - "modifiers": { - "mandatory": [ - "left_option" - ] - } + "modifiers": { "mandatory": ["left_option"] } }, "to": [ { "key_code": "tab", - "modifiers": [ - "left_command" - ] + "modifiers": ["left_command"] } ], "type": "basic" @@ -439,490 +336,55 @@ }, "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": 835, "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": [ { - "from": { - "apple_vendor_top_case_key_code": "keyboard_fn" - }, - "to": [ - { - "key_code": "left_control" - } - ] + "from": { "apple_vendor_top_case_key_code": "keyboard_fn" }, + "to": [{ "key_code": "left_control" }] }, { - "from": { - "key_code": "left_command" - }, - "to": [ - { - "key_code": "left_option" - } - ] + "from": { "key_code": "left_command" }, + "to": [{ "key_code": "left_option" }] }, { - "from": { - "key_code": "left_control" - }, - "to": [ - { - "apple_vendor_top_case_key_code": "keyboard_fn" - } - ] + "from": { "key_code": "left_control" }, + "to": [{ "apple_vendor_top_case_key_code": "keyboard_fn" }] }, { - "from": { - "key_code": "left_option" - }, - "to": [ - { - "key_code": "left_command" - } - ] + "from": { "key_code": "left_option" }, + "to": [{ "key_code": "left_command" }] }, { - "from": { - "key_code": "right_command" - }, - "to": [ - { - "key_code": "caps_lock" - } - ] - } - ], - "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": 835, - "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": false, - "is_pointing_device": true, - "product_id": 34614, - "vendor_id": 2522 - }, - "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 - } - ], - "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": { "key_code": "right_command" }, + "to": [{ "key_code": "caps_lock" }] } ] } ], "name": "x", - "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": "right_option" - }, - "to": [ - { - "key_code": "caps_lock" - } - ] + "from": { "key_code": "right_option" }, + "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" } }, { - "complex_modifications": { - "parameters": { - "basic.simultaneous_threshold_milliseconds": 50, - "basic.to_delayed_action_delay_milliseconds": 500, - "basic.to_if_alone_timeout_milliseconds": 1000, - "basic.to_if_held_down_threshold_milliseconds": 500, - "mouse_motion_to_scroll.speed": 100 - }, - "rules": [] - }, - "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": 835, - "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": 835, - "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": false, - "is_pointing_device": true, - "product_id": 34614, - "vendor_id": 2522 - }, - "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 - } - ], - "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", - "parameters": { - "delay_milliseconds_before_open_device": 1000 - }, - "selected": false, - "simple_modifications": [], - "virtual_hid_keyboard": { - "country_code": 0, - "indicate_sticky_modifier_keys_state": true, - "mouse_key_xy_scale": 100 - } + "virtual_hid_keyboard": { "country_code": 0 } } ] } \ No newline at end of file diff --git a/dotfiles/home/.emacs.d/centaur b/dotfiles/home/.emacs.d/centaur index fc00505..50aabfc 100644 --- a/dotfiles/home/.emacs.d/centaur +++ b/dotfiles/home/.emacs.d/centaur @@ -1 +1 @@ -cf0248dabd7412b18ef0b84fad4553ff3fc523a2 refs/heads/master +13ac08cda0b0f68430d69ec0790bc6ce75d2783b refs/heads/master diff --git a/dotfiles/home/.emacs.d/lisp/init-completion.el b/dotfiles/home/.emacs.d/lisp/init-completion.el index ceeb956..a1eb396 100644 --- a/dotfiles/home/.emacs.d/lisp/init-completion.el +++ b/dotfiles/home/.emacs.d/lisp/init-completion.el @@ -34,6 +34,7 @@ (add-to-list 'orderless-matching-styles 'completion--regex-pinyin)) (use-package vertico + :custom (vertico-count 15) :bind (:map vertico-map ("RET" . vertico-directory-enter) ("DEL" . vertico-directory-delete-char) diff --git a/dotfiles/home/.emacs.d/lisp/init-ui.el b/dotfiles/home/.emacs.d/lisp/init-ui.el index 5466b86..e937268 100644 --- a/dotfiles/home/.emacs.d/lisp/init-ui.el +++ b/dotfiles/home/.emacs.d/lisp/init-ui.el @@ -219,7 +219,10 @@ ;; Show line numbers (use-package display-line-numbers :ensure nil - :hook ((prog-mode yaml-mode yaml-ts-mode conf-mode) . display-line-numbers-mode) + :hook ((prog-mode + conf-mode toml-ts-mode + yaml-mode yaml-ts-mode) + . display-line-numbers-mode) :init (setq display-line-numbers-width-start t)) ;; Suppress GUI features