diff --git a/karabiner.json b/karabiner.json index 851a2fb..bbcf41e 100644 --- a/karabiner.json +++ b/karabiner.json @@ -1,8 +1,10 @@ { "global": { + "ask_for_confirmation_before_quitting": true, "check_for_updates_on_startup": true, "show_in_menu_bar": false, - "show_profile_name_in_menu_bar": false + "show_profile_name_in_menu_bar": false, + "unsafe_ui": false }, "profiles": [ { @@ -41,73 +43,6 @@ } ] }, - { - "description": "Ctrl-h to backspace", - "manipulators": [ - { - "conditions": [ - { - "bundle_identifiers": [ - "^org\\.gnu\\.Emacs$", - "^org\\.gnu\\.AquamacsEmacs$", - "^org\\.gnu\\.Aquamacs$", - "^org\\.pqrs\\.unknownapp.conkeror$", - "^com\\.microsoft\\.rdc$", - "^com\\.microsoft\\.rdc\\.", - "^net\\.sf\\.cord$", - "^com\\.thinomenon\\.RemoteDesktopConnection$", - "^com\\.itap-mobile\\.qmote$", - "^com\\.nulana\\.remotixmac$", - "^com\\.p5sys\\.jump\\.mac\\.viewer$", - "^com\\.p5sys\\.jump\\.mac\\.viewer\\.", - "^com\\.teamviewer\\.TeamViewer$", - "^com\\.vmware\\.horizon$", - "^com\\.2X\\.Client\\.Mac$", - "^com\\.apple\\.Terminal$", - "^com\\.googlecode\\.iterm2$", - "^co\\.zeit\\.hyperterm$", - "^co\\.zeit\\.hyper$", - "^org\\.alacritty$", - "^net\\.kovidgoyal\\.kitty$", - "^org\\.vim\\.", - "^com\\.qvacua\\.VimR$", - "^com\\.vmware\\.fusion$", - "^com\\.vmware\\.horizon$", - "^com\\.vmware\\.view$", - "^com\\.parallels\\.desktop$", - "^com\\.parallels\\.vm$", - "^com\\.parallels\\.desktop\\.console$", - "^org\\.virtualbox\\.app\\.VirtualBoxVM$", - "^com\\.citrix\\.XenAppViewer$", - "^com\\.vmware\\.proxyApp\\.", - "^com\\.parallels\\.winapp\\.", - "^org\\.x\\.X11$", - "^com\\.apple\\.x11$", - "^org\\.macosforge\\.xquartz\\.X11$", - "^org\\.macports\\.X11$", - "^com\\.sublimetext\\.", - "^com\\.microsoft\\.VSCode$" - ], - "type": "frontmost_application_unless" - } - ], - "from": { - "key_code": "j", - "modifiers": { - "mandatory": [ - "control" - ] - } - }, - "to": [ - { - "key_code": "delete_or_backspace" - } - ], - "type": "basic" - } - ] - }, { "description": "Ctrl-m to enter", "manipulators": [ @@ -175,76 +110,6 @@ } ] }, - { - "description": "Ctrl-w to backspace", - "manipulators": [ - { - "conditions": [ - { - "bundle_identifiers": [ - "^org\\.gnu\\.Emacs$", - "^org\\.gnu\\.AquamacsEmacs$", - "^org\\.gnu\\.Aquamacs$", - "^org\\.pqrs\\.unknownapp.conkeror$", - "^com\\.microsoft\\.rdc$", - "^com\\.microsoft\\.rdc\\.", - "^net\\.sf\\.cord$", - "^com\\.thinomenon\\.RemoteDesktopConnection$", - "^com\\.itap-mobile\\.qmote$", - "^com\\.nulana\\.remotixmac$", - "^com\\.p5sys\\.jump\\.mac\\.viewer$", - "^com\\.p5sys\\.jump\\.mac\\.viewer\\.", - "^com\\.teamviewer\\.TeamViewer$", - "^com\\.vmware\\.horizon$", - "^com\\.2X\\.Client\\.Mac$", - "^com\\.apple\\.Terminal$", - "^com\\.googlecode\\.iterm2$", - "^co\\.zeit\\.hyperterm$", - "^co\\.zeit\\.hyper$", - "^org\\.alacritty$", - "^net\\.kovidgoyal\\.kitty$", - "^org\\.vim\\.", - "^com\\.qvacua\\.VimR$", - "^com\\.vmware\\.fusion$", - "^com\\.vmware\\.horizon$", - "^com\\.vmware\\.view$", - "^com\\.parallels\\.desktop$", - "^com\\.parallels\\.vm$", - "^com\\.parallels\\.desktop\\.console$", - "^org\\.virtualbox\\.app\\.VirtualBoxVM$", - "^com\\.citrix\\.XenAppViewer$", - "^com\\.vmware\\.proxyApp\\.", - "^com\\.parallels\\.winapp\\.", - "^org\\.x\\.X11$", - "^com\\.apple\\.x11$", - "^org\\.macosforge\\.xquartz\\.X11$", - "^org\\.macports\\.X11$", - "^com\\.sublimetext\\.", - "^com\\.microsoft\\.VSCode$" - ], - "type": "frontmost_application_unless" - } - ], - "from": { - "key_code": "comma", - "modifiers": { - "mandatory": [ - "control" - ] - } - }, - "to": [ - { - "key_code": "delete_or_backspace", - "modifiers": [ - "left_option" - ] - } - ], - "type": "basic" - } - ] - }, { "description": "Ctrl-p to up", "manipulators": [ @@ -385,7 +250,9 @@ { "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": 1553, @@ -393,6 +260,12 @@ }, "ignore": false, "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": [ { "from": { @@ -434,12 +307,15 @@ } ] } - ] + ], + "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": 601, @@ -447,12 +323,21 @@ }, "ignore": false, "manipulate_caps_lock_led": true, - "simple_modifications": [] + "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": 49970, @@ -460,12 +345,21 @@ }, "ignore": true, "manipulate_caps_lock_led": false, - "simple_modifications": [] + "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": 49970, @@ -473,12 +367,21 @@ }, "ignore": true, "manipulate_caps_lock_led": false, - "simple_modifications": [] + "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": 4694, @@ -486,12 +389,21 @@ }, "ignore": false, "manipulate_caps_lock_led": false, - "simple_modifications": [] + "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": 34304, @@ -499,7 +411,58 @@ }, "ignore": false, "manipulate_caps_lock_led": true, - "simple_modifications": [] + "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": 0, + "vendor_id": 0 + }, + "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": 0, + "vendor_id": 0 + }, + "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": [ @@ -639,4 +602,4 @@ } } ] -} +} \ No newline at end of file diff --git a/lazyvim-options.lua b/lazyvim-options.lua new file mode 100644 index 0000000..cb9a74d --- /dev/null +++ b/lazyvim-options.lua @@ -0,0 +1,6 @@ +-- Options are automatically loaded before lazy.nvim startup +-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua +-- Add any additional options here + +vim.opt.relativenumber = false +vim.g.autoformat = false diff --git a/lazyvim-plugins.lua b/lazyvim-plugins.lua index df88af4..aea27cf 100644 --- a/lazyvim-plugins.lua +++ b/lazyvim-plugins.lua @@ -1,32 +1,101 @@ return { - { "catppuccin/nvim", name = "catppuccin" }, - - { - "LazyVim/LazyVim", - opts = { - colorscheme = "catppuccin", - }, - }, - - { - "nvim-orgmode/orgmode", - config = function() - require("orgmode").setup_ts_grammar() - - require("nvim-treesitter.configs").setup({ - highlight = { - enable = true, - additional_vim_regex_highlighting = { "org" }, -- Required for spellcheck, some LaTex highlights and code block highlights that do not have ts grammar - }, - ensure_installed = { "org" }, -- Or run :TSUpdate org - }) - - require("orgmode").setup({ - org_agenda_files = { "~/Sync/Notes/*" }, - org_default_notes_file = "~/Sync/Notes/Main.org", - }) - end, - }, - - { "dhruvasagar/vim-table-mode" }, + + { "tpope/vim-sleuth" }, + + { + "catppuccin/nvim", + name = "catppuccin", + config = function() + require("catppuccin").setup({ + transparent_background = true, + }) + end, + }, + + -- { + -- "f-person/auto-dark-mode.nvim", + -- config = { + -- set_dark_mode = function() + -- vim.api.nvim_set_option("background", "dark") + -- vim.cmd("colorscheme catppuccin") + -- -- vim.cmd("colorscheme rose-pine") + -- end, + -- set_light_mode = function() + -- vim.api.nvim_set_option("background", "light") + -- vim.cmd("colorscheme catppuccin") + -- -- vim.cmd("colorscheme rose-pine") + -- end, + -- }, + -- }, + + { + "LazyVim/LazyVim", + opts = { + colorscheme = "catppuccin", + background_colour = "#000000", + }, + }, + + { + "nvim-orgmode/orgmode", + config = function() + require("orgmode").setup_ts_grammar() + + require("nvim-treesitter.configs").setup({ + highlight = { + enable = true, + additional_vim_regex_highlighting = { "org" }, -- Required for spellcheck, some LaTex highlights and code block highlights that do not have ts grammar + }, + ensure_installed = { "org" }, -- Or run :TSUpdate org + }) + + require("orgmode").setup({ + org_agenda_files = { "~/Sync/Notes/*" }, + org_default_notes_file = "~/Sync/Notes/Main.org", + }) + end, + }, + + { "dhruvasagar/vim-table-mode" }, + + { + "akinsho/toggleterm.nvim", + version = "*", + config = true, + keys = { + { [[]] }, + { + "TT", + "ToggleTerm direction=horizontal", + desc = "Open a horizontal terminal", + }, + { + "TV", + "ToggleTerm size=60 direction=vertical", + desc = "Open a vertical terminal", + }, + }, + }, + + { + "christoomey/vim-tmux-navigator", + cmd = { + "TmuxNavigateLeft", + "TmuxNavigateDown", + "TmuxNavigateUp", + "TmuxNavigateRight", + "TmuxNavigatePrevious", + }, + keys = { + { "", "TmuxNavigateLeft" }, + { "", "TmuxNavigateDown" }, + { "", "TmuxNavigateUp" }, + { "", "TmuxNavigateRight" }, + { "", "TmuxNavigatePrevious" }, + }, + }, + + -- { + -- "https://git.sr.ht/~soywod/himalaya-vim", + -- }, }