From 383f1249c3e0c0c737b3fcbe5f6beb9f9af7d4c7 Mon Sep 17 00:00:00 2001 From: Matthew Leong Date: Wed, 28 Aug 2024 11:56:32 -0700 Subject: [PATCH] feat: update hotkeys --- lazy-lock.json | 56 ++++++++++++------------- lua/cosmic/core/mappings.lua | 19 +++------ lua/cosmic/plugins/gitsigns/init.lua | 24 +++++------ lua/cosmic/plugins/toggleterm/init.lua | 14 ++----- lua/cosmic/plugins/toggleterm/utils.lua | 8 +++- lua/cosmic/plugins/which-key/init.lua | 28 ++++++------- 6 files changed, 69 insertions(+), 80 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 9fe45ba..9fab2c6 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,8 +1,8 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, - "SchemaStore.nvim": { "branch": "main", "commit": "2580d32172f66fa37c0e57fb14e1b5bc94ed9e15" }, - "auto-session": { "branch": "main", "commit": "08c279882d4117a3e6ade1a014f7cf4af7c34fec" }, + "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" }, + "SchemaStore.nvim": { "branch": "main", "commit": "ae75241aed204d829fe15595bbf05e6fbf3d49dd" }, + "auto-session": { "branch": "main", "commit": "0e9aa77525b5217e8eacb36007edd3d02bb2a91a" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, @@ -10,37 +10,37 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "cosmic-ui": { "branch": "main", "commit": "c0b14531999f2bfef3d927c4dcd57a1a8fed5ee9" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" }, - "lazy.nvim": { "branch": "main", "commit": "d731a6b005fd239e85e555bd57362382f6c1e461" }, - "lazydev.nvim": { "branch": "main", "commit": "02f1055a777264d4b65896051ec28d0f322f7932" }, - "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, + "gitsigns.nvim": { "branch": "main", "commit": "899e993850084ea33d001ec229d237bc020c19ae" }, + "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, + "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, - "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, - "noice.nvim": { "branch": "main", "commit": "3b5ea551448bd769976428458c11ae3f5849b7ba" }, - "none-ls-extras.nvim": { "branch": "main", "commit": "059bb6561b8f5ff99a7acc9262b557ebbe5c34ec" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "482350b050bd413931c2cdd4857443c3da7d57cb" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, + "none-ls-extras.nvim": { "branch": "main", "commit": "dfdc998a8c7bb728abab156942bd43ed2345845a" }, "none-ls-shellcheck.nvim": { "branch": "main", "commit": "0f84461241e76e376a95fb7391deac82dc3efdbf" }, - "none-ls.nvim": { "branch": "main", "commit": "2870f66b1cb263f6e0bfffdb089739b874343a3a" }, + "none-ls.nvim": { "branch": "main", "commit": "203f5ebde4a1af48ba2eb146401b5be2e7866942" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, - "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, + "nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" }, + "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-lspconfig": { "branch": "master", "commit": "01e08d4bf1c35e5126b2ad5209725e4c552289ab" }, + "nvim-lspconfig": { "branch": "master", "commit": "2a6f00ff66e276ab3289be8bb9f844f7ab385848" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-tree.lua": { "branch": "master", "commit": "f9ff00bc06d7cb70548a3847d7a2a05e928bc988" }, - "nvim-treesitter": { "branch": "master", "commit": "3076b9a98a130a3601a41c5e3def1ffb8b796367" }, + "nvim-tree.lua": { "branch": "master", "commit": "d43ab67d0eb4317961c5e9d15fffe908519debe0" }, + "nvim-treesitter": { "branch": "master", "commit": "7a64148896289a91cb2a92e9da3f76d5512a3fb8" }, "nvim-treesitter-refactor": { "branch": "master", "commit": "65ad2eca822dfaec2a3603119ec3cc8826a7859e" }, - "nvim-ts-autotag": { "branch": "main", "commit": "26c365cc7d58d0da17b13e747855d331eb26fcf0" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" }, - "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, + "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "375c2d86cee6674afd75b4f727ce3a80065552f7" }, + "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "nx.nvim": { "branch": "main", "commit": "f8a3a21b3d540889401a40d1f2803083794c0372" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, - "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, - "todo-comments.nvim": { "branch": "main", "commit": "96fee098a90e7c09c9811aa7df71d773ba8b9b53" }, - "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" }, - "tokyonight.nvim": { "branch": "main", "commit": "6adfcde66e8af2f22dd5d76060980abd8daa0df8" }, - "vim-fugitive": { "branch": "master", "commit": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc" }, - "which-key.nvim": { "branch": "main", "commit": "a1770d266f58499ca03e0b83272f07003052dbed" } -} \ No newline at end of file + "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" }, + "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, + "toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" }, + "tokyonight.nvim": { "branch": "main", "commit": "b0e7c7382a7e8f6456f2a95655983993ffda745e" }, + "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, + "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } +} diff --git a/lua/cosmic/core/mappings.lua b/lua/cosmic/core/mappings.lua index a36b4ac..c83fdcf 100644 --- a/lua/cosmic/core/mappings.lua +++ b/lua/cosmic/core/mappings.lua @@ -9,9 +9,11 @@ map('n', 'cp', ':cprevzz', { desc = 'Prev Item' }) map('n', 'cn', ':cnextzz', { desc = 'Next Item' }) -- buffer navigation -map('n', 'bp', ':bprev', { desc = 'Prev buffer' }) -map('n', 'bn', ':bnext', { desc = 'Next buffer' }) -map('n', 'bd', ':bdelete', { desc = 'Delete buffer' }) +map('n', 'kp', ':bprev', { desc = 'Prev buffer' }) +map('n', 'kn', ':bnext', { desc = 'Next buffer' }) +map('n', 'kd', ':bdelete', { desc = 'Delete buffer' }) +map('n', 'kc', ':new', { desc = 'New buffer' }) +map('n', 'ko', '%bd|e#', { desc = 'Close all buffers but the current one' }) -- https://stackoverflow.com/a/42071865/516188 -- tab navigation map('n', 'tp', ':tabprevious', { desc = 'Prev tab' }) @@ -33,14 +35,3 @@ map('n', '', ':resize -2', { desc = 'Resize -2' }) map('n', '', ':resize +2', { desc = 'Resize +2' }) map('n', '', ':vertical resize -2', { desc = 'Vertical Resize -2' }) map('n', '', ':vertical resize +2', { desc = 'Vertical Resize +2' }) - --- map('n', '', [[wincmd h]], {}) --- map('n', '', [[wincmd j]], {}) --- map('n', '', [[wincmd k]], {}) --- map('n', '', [[wincmd l]], {}) ---[[ map('n', '', 'h', {}) ]] ---[[ map('n', '', 'j', {}) ]] ---[[ map('n', '', 'k', {}) ]] ---[[ map('n', '', 'l', {}) ]] - -map('n', 'bo', '%bd|e#', { desc = 'Close all buffers but the current one' }) -- https://stackoverflow.com/a/42071865/516188 diff --git a/lua/cosmic/plugins/gitsigns/init.lua b/lua/cosmic/plugins/gitsigns/init.lua index ba11626..1e71bc4 100644 --- a/lua/cosmic/plugins/gitsigns/init.lua +++ b/lua/cosmic/plugins/gitsigns/init.lua @@ -53,30 +53,30 @@ return { }) -- Actions - map('n', 'hs', gs.stage_hunk, { desc = 'Stage hunk' }) - map('n', 'hr', gs.reset_hunk, { desc = 'Reset hunk' }) - map('v', 'hs', function() + map('n', 'vs', gs.stage_hunk, { desc = 'Stage hunk' }) + map('n', 'vr', gs.reset_hunk, { desc = 'Reset hunk' }) + map('v', 'vs', function() gs.stage_hunk({ vim.fn.line('.'), vim.fn.line('v') }) end, { desc = 'Stage hunk selection', }) - map('v', 'hr', function() + map('v', 'vr', function() gs.reset_hunk({ vim.fn.line('.'), vim.fn.line('v') }) end, { desc = 'Reset hunk selection', }) - map('n', 'hS', gs.stage_buffer, { desc = 'Stage buffer' }) - map('n', 'hu', gs.undo_stage_hunk, { desc = 'Undo stage hunk' }) - map('n', 'hR', gs.reset_buffer, { desc = 'Reset buffer' }) - map('n', 'hp', gs.preview_hunk, { desc = 'Preview hunk' }) - map('n', 'hb', function() + map('n', 'vS', gs.stage_buffer, { desc = 'Stage buffer' }) + map('n', 'vu', gs.undo_stage_hunk, { desc = 'Undo stage hunk' }) + map('n', 'vR', gs.reset_buffer, { desc = 'Reset buffer' }) + map('n', 'vp', gs.preview_hunk, { desc = 'Preview hunk' }) + map('n', 'vb', function() gs.blame_line({ full = true }) end, { desc = 'Blame line', }) - map('n', 'htb', gs.toggle_current_line_blame, { desc = 'Toggle blame current line' }) - map('n', 'hd', gs.diffthis, { desc = 'Diff buffer' }) - map('n', 'hD', function() + map('n', 'vtb', gs.toggle_current_line_blame, { desc = 'Toggle blame current line' }) + map('n', 'vd', gs.diffthis, { desc = 'Diff buffer' }) + map('n', 'vD', function() gs.diffthis('~') end, { desc = 'Diff project' }) map('n', 'td', gs.toggle_deleted, { desc = 'Toggle delete' }) diff --git a/lua/cosmic/plugins/toggleterm/init.lua b/lua/cosmic/plugins/toggleterm/init.lua index dd5f690..475c055 100644 --- a/lua/cosmic/plugins/toggleterm/init.lua +++ b/lua/cosmic/plugins/toggleterm/init.lua @@ -16,23 +16,17 @@ return { }) local terminal_utils = require('cosmic.plugins.toggleterm.utils') - map('t', 'k', [[]], { desc = 'Visual mode' }) - -- toggle terminals - map('n', 'kk', ':ToggleTerm', { desc = 'Toggle Terminal' }) - map('t', 'kk', [[]] .. ':ToggleTerm', { desc = 'Toggle Terminal' }) + map('n', 'xx', ':ToggleTerm', { desc = 'Toggle Terminal' }) -- new terminal - map('n', 'kn', terminal_utils.new_terminal, { desc = 'New terminal' }) - map('t', 'kn', terminal_utils.new_terminal, { desc = 'New terminal' }) + map('n', 'xn', terminal_utils.new_terminal, { desc = 'New terminal' }) -- select terminal to open - map('n', 'kf', ':TermSelect', { desc = 'Choose open terminal' }) - map('t', 'kf', [[]] .. ':TermSelect', { desc = 'Choose open terminal' }) + map('n', 'fx', ':TermSelect', { desc = 'Find open terminal' }) -- rename terminal - map('n', 'kr', ':ToggleTermSetName', { desc = 'Rename terminal', buffer = 0 }) - map('t', 'kr', [[]] .. ':ToggleTermSetName', { desc = 'Rename terminal', buffer = 0 }) + map('n', 'xr', ':ToggleTermSetName', { desc = 'Rename terminal', buffer = 0 }) -- terminal only mappings vim.cmd("autocmd! TermOpen term://* lua require('cosmic.plugins.toggleterm.utils').set_terminal_keymaps()") diff --git a/lua/cosmic/plugins/toggleterm/utils.lua b/lua/cosmic/plugins/toggleterm/utils.lua index 79ff942..9a5b8d9 100644 --- a/lua/cosmic/plugins/toggleterm/utils.lua +++ b/lua/cosmic/plugins/toggleterm/utils.lua @@ -7,6 +7,12 @@ function M.new_terminal() terminal:toggle() end -function M.set_terminal_keymaps() end +function M.set_terminal_keymaps() + map('t', '', [[]], { desc = 'Visual mode' }) + -- map('t', 'xx', [[]] .. ':ToggleTerm', { desc = 'Toggle Terminal' }) + -- map('t', 'xn', M.new_terminal, { desc = 'New terminal' }) + -- map('t', 'fx', [[]] .. ':TermSelect', { desc = 'Find open terminal' }) + -- map('t', 'xr', [[]] .. ':ToggleTermSetName', { desc = 'Rename terminal', buffer = 0 }) +end return M diff --git a/lua/cosmic/plugins/which-key/init.lua b/lua/cosmic/plugins/which-key/init.lua index 2730f9e..d86883c 100644 --- a/lua/cosmic/plugins/which-key/init.lua +++ b/lua/cosmic/plugins/which-key/init.lua @@ -9,9 +9,10 @@ return { wo = { winblend = 20, }, + padding = { 3, 5 }, -- extra window padding [top/bottom, right/left] }, layout = { - height = { min = 4, max = 25 }, + height = { min = 10, max = 25 }, width = { min = 20, max = 50 }, spacing = 8, align = 'center', @@ -19,23 +20,20 @@ return { }) wk.add({ - { 'b', group = 'buffer' }, - { 'c', group = 'quickfix' }, - { 'f', group = 'find' }, - { 'h', group = 'gitsigns' }, - { 'h', group = 'gitsigns' }, - { 'ht', group = 'toggle' }, - { 'k', group = 'terminal' }, - { 'l', group = 'lsp' }, + { 'k', group = 'buffer' }, + { 'c', group = 'quickfix' }, + { 'f', group = 'find' }, + { 'g', group = 'goto' }, + { 'x', group = 'terminal' }, + { 'l', group = 'lsp' }, { 'ld', group = 'diagnostics' }, { 'lt', group = 'toggle' }, { 'lw', group = 'workspace' }, - { 'g', group = 'goto' }, - { 'n', group = 'tree' }, - { 's', group = 'session' }, - { 't', group = 'tab' }, - { 'p', group = 'plugins' }, - { 'v', group = 'git' }, + { 'n', group = 'tree' }, + { 'p', group = 'plugins' }, + { 's', group = 'session' }, + { 't', group = 'tab' }, + { 'v', group = 'git' }, { 'vt', group = 'toggle' }, }) end,