From: Georgios Atheridis Date: Tue, 16 Jul 2024 20:11:53 +0000 (+0100) Subject: Update which-key X-Git-Url: https://git.atheridis.org/?a=commitdiff_plain;h=af998945871bb00f489219c4b875e4ee2fae5cac;p=configs%2Fnvim.git Update which-key --- diff --git a/lua/keymaps.lua b/lua/keymaps.lua index 9af5685..33e88a2 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -82,47 +82,46 @@ nnoremap("", ":call vm#commands#add_cursor_up(0, v:count1)") local wk = require("which-key") -- Tree -wk.register({ - ["e"] = { vim.cmd.NvimTreeToggle, "File Tree" }, - ["u"] = { vim.cmd.UndotreeToggle, "Undo Tree" }, - ["i"] = { vim.cmd.InspectTree, "Inspect Tree" }, +wk.add({ + { "e", vim.cmd.NvimTreeToggle, desc = "File Tree" }, + { "u", vim.cmd.UndotreeToggle, desc = "Undo Tree" }, + { "i", vim.cmd.InspectTree, desc = "Inspect Tree" }, }) -- Telescope -wk.register({ - ["s"] = { name = "Search" }, - -- ["sf"] = { telescope.find_files, "Find Files" }, - ["sf"] = { "Telescope frecency workspace=CWD", "Search Files" }, - ["ss"] = { telescope.live_grep, "Grep" }, - ["sg"] = { telescope.grep_string, "Grep String Under Cursor" }, - ["sM"] = { telescope.man_pages, "Man Pages" }, - ["sm"] = { telescope.marks, "List Marks" }, - ["sh"] = { telescope.help_tags, "Help Tags" }, - ["sb"] = { telescope.buffers, "Buffers" }, - ["sr"] = { telescope.lsp_references, "References" }, - ["sG"] = { telescope.git_files, "Find Git Files" }, - ["sS"] = { telescope.treesitter, "Symbols" }, +wk.add({ + { "s", group = "Search" }, + { "sf", "Telescope frecency workspace=CWD", desc = "Search Files" }, + { "ss", telescope.live_grep, desc = "Grep" }, + { "sg", telescope.grep_string, desc = "Grep String Under Cursor" }, + { "sM", telescope.man_pages, desc = "Man Pages" }, + { "sm", telescope.marks, desc = "List Marks" }, + { "sh", telescope.help_tags, desc = "Help Tags" }, + { "sb", telescope.buffers, desc = "Buffers" }, + { "sr", telescope.lsp_references, desc = "References" }, + { "sG", telescope.git_files, desc = "Find Git Files" }, + { "sS", telescope.treesitter, desc = "Symbols" }, }) -- LSP Keymaps -wk.register({ - ["l"] = { name = "LSP" }, - ["lD"] = { vim.lsp.buf.declaration, "Goto Declarations" }, - ["ld"] = { vim.lsp.buf.definition, "Goto Definition" }, - ["li"] = { vim.lsp.buf.implementation, "Goto Implementation" }, - ["lh"] = { vim.lsp.buf.hover, "Show Documentation" }, - ["lr"] = { vim.lsp.buf.rename, "Rename" }, - ["lR"] = { telescope.lsp_references, "Goto References" }, - ["la"] = { vim.lsp.buf.code_action, "Code Action" }, - ["lf"] = { vim.lsp.buf.format, "Format Code" }, +wk.add({ + { "l", group = "LSP" }, + { "lD", vim.lsp.buf.declaration, desc = "Goto Declarations" }, + { "ld", vim.lsp.buf.definition, desc = "Goto Definition" }, + { "li", vim.lsp.buf.implementation, desc = "Goto Implementation" }, + { "lh", vim.lsp.buf.hover, desc = "Show Documentation" }, + { "lr", vim.lsp.buf.rename, desc = "Rename" }, + { "lR", telescope.lsp_references, desc = "Goto References" }, + { "la", vim.lsp.buf.code_action, desc = "Code Action" }, + { "lf", vim.lsp.buf.format, desc = "Format Code" }, }) -wk.register({ - ["d"] = { name = "Diagnostics" }, - ["df"] = { vim.diagnostic.open_float(), "Show Diagnostics in Line" }, - ["dp"] = { function() vim.diagnostic.goto_prev({ border = "rounded" }) end, "Goto Prev Diagnostic" }, - ["dn"] = { function() vim.diagnostic.goto_next({ border = "rounded" }) end, "Goto Next Diagnostic" }, - ["da"] = { telescope.diagnostics, "Show Open Diagnostics" }, +wk.add({ + { "d", group = "Diagnostics" }, + { "df", vim.diagnostic.open_float(), desc = "Show Diagnostics in Line" }, + { "dp", function() vim.diagnostic.goto_prev({ border = "rounded" }) end, desc = "Goto Prev Diagnostic" }, + { "dn", function() vim.diagnostic.goto_next({ border = "rounded" }) end, desc = "Goto Next Diagnostic" }, + { "da", telescope.diagnostics, desc = "Show Open Diagnostics" }, -- ["da"] = { vim.diagnostic.setloclist(), "Show All Diagnostics in Buffer" }, }) nnoremap("gD", vim.lsp.buf.declaration) @@ -136,24 +135,24 @@ nnoremap("]d", function() vim.diagnostic.goto_next({ border = "rounded" }) end) -- Gitsigns local gs = require("gitsigns") -wk.register({ - ["g"] = { name = "Git" }, - ["gj"] = { gs.next_hunk, "Next Hunk" }, - ["gk"] = { gs.prev_hunk, "Prev Hunk" }, - ["gs"] = { function() gs.stage_hunk { vim.fn.line("."), vim.fn.line("v") } end, "Stage Hunk" }, - ["gr"] = { function() gs.reset_hunk { vim.fn.line("."), vim.fn.line("v") } end, "Reset Hunk" }, - ["gp"] = { gs.preview_hunk, "Preview Hunk" }, - ["gu"] = { gs.undo_stage_hunk, "Undo Stage Hunk" }, - ["gS"] = { gs.stage_buffer, "Stage Buffer" }, - ["gb"] = { function() gs.blame_line { vim.fn.line("."), vim.fn.line("v") } end, "Blame Line" }, - ["gB"] = { gs.toggle_current_line_blame, "Toggle Blame Line" }, - ["gR"] = { gs.reset_buffer, "Reset Buffer" }, - ["gd"] = { gs.diffthis, "Diff" }, - ["gD"] = { function() gs.diffthis("~") end, "Diff2" }, - ["gx"] = { gs.toggle_deleted, "Toggle Deleted" }, - ["gc"] = { telescope.git_bcommits, "Buffer Commits" }, - ["gC"] = { telescope.git_commits, "Commits" }, - ["gn"] = { telescope.git_branches, "Branches" }, +wk.add({ + { "g", group = "Git" }, + { "gj", gs.next_hunk, desc = "Next Hunk" }, + { "gk", gs.prev_hunk, desc = "Prev Hunk" }, + { "gs", function() gs.stage_hunk { vim.fn.line("."), vim.fn.line("v") } end, desc = "Stage Hunk" }, + { "gr", function() gs.reset_hunk { vim.fn.line("."), vim.fn.line("v") } end, desc = "Reset Hunk" }, + { "gp", gs.preview_hunk, desc = "Preview Hunk" }, + { "gu", gs.undo_stage_hunk, desc = "Undo Stage Hunk" }, + { "gS", gs.stage_buffer, desc = "Stage Buffer" }, + { "gb", function() gs.blame_line { vim.fn.line("."), vim.fn.line("v") } end, desc = "Blame Line" }, + { "gB", gs.toggle_current_line_blame, desc = "Toggle Blame Line" }, + { "gR", gs.reset_buffer, desc = "Reset Buffer" }, + { "gd", gs.diffthis, desc = "Diff" }, + { "gD", function() gs.diffthis("~") end, desc = "Diff2" }, + { "gx", gs.toggle_deleted, desc = "Toggle Deleted" }, + { "gc", telescope.git_bcommits, desc = "Buffer Commits" }, + { "gC", telescope.git_commits, desc = "Commits" }, + { "gn", telescope.git_branches, desc = "Branches" }, }) -- -- Text object -- map({ "o", "x" }, "ih", ":Gitsigns select_hunk")