From bbe09a41e6465ff0eac2d2c6a80f14a10a9e0469 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Sun, 26 Jan 2025 05:29:40 +0100 Subject: [PATCH] Updated which-key description + small config changed + changed file search keybind --- nvim/dot-config/nvim/lua/plugins/bufdel.lua | 14 ++++---- .../nvim/lua/plugins/bufferline.lua | 4 +-- nvim/dot-config/nvim/lua/plugins/dap.lua | 8 ++--- nvim/dot-config/nvim/lua/plugins/gitsigns.lua | 28 +++++---------- .../nvim/lua/plugins/guess-indent.lua | 6 ++-- nvim/dot-config/nvim/lua/plugins/lsp.lua | 18 +++++----- .../dot-config/nvim/lua/plugins/telescope.lua | 34 +++++++------------ .../nvim/lua/plugins/todo-comments.lua | 2 +- .../dot-config/nvim/lua/plugins/which-key.lua | 20 ++++------- 9 files changed, 53 insertions(+), 81 deletions(-) diff --git a/nvim/dot-config/nvim/lua/plugins/bufdel.lua b/nvim/dot-config/nvim/lua/plugins/bufdel.lua index 21c2940..456076f 100644 --- a/nvim/dot-config/nvim/lua/plugins/bufdel.lua +++ b/nvim/dot-config/nvim/lua/plugins/bufdel.lua @@ -1,23 +1,23 @@ -- https://github.com/ojroques/nvim-bufdel return { - 'ojroques/nvim-bufdel', + "ojroques/nvim-bufdel", cmd = { "BufDel", "BuffDelOthers" }, keys = { { - 'bd', + "bd", function() - require('bufdel').delete_buffer_expr(nil, false) + require("bufdel").delete_buffer_expr(nil, false) end, silent = true, - desc = '[B]uffer [d]elete' + desc = "Buffer delete", }, { - 'bD', + "bD", function() - require('bufdel').delete_buffer_others(false) + require("bufdel").delete_buffer_others(false) end, silent = true, - desc = '[B]uffer [D]elete others' + desc = "Buffer delete others", }, }, } diff --git a/nvim/dot-config/nvim/lua/plugins/bufferline.lua b/nvim/dot-config/nvim/lua/plugins/bufferline.lua index 52b1dc5..571b5fd 100644 --- a/nvim/dot-config/nvim/lua/plugins/bufferline.lua +++ b/nvim/dot-config/nvim/lua/plugins/bufferline.lua @@ -24,10 +24,10 @@ return { -- Setup keybinds to move buffers around vim.keymap.set("n", "b[", function() bufferline.move(-1) - end, { silent = true, desc = "[B]uffer to the [ left" }) + end, { silent = true, desc = "Move buffer to left" }) vim.keymap.set("n", "b]", function() bufferline.move(1) - end, { silent = true, desc = "[B]uffer to the ] right" }) + end, { silent = true, desc = "Move buffer to right" }) bufferline.setup({ options = { diff --git a/nvim/dot-config/nvim/lua/plugins/dap.lua b/nvim/dot-config/nvim/lua/plugins/dap.lua index eb395e4..5df9d20 100644 --- a/nvim/dot-config/nvim/lua/plugins/dap.lua +++ b/nvim/dot-config/nvim/lua/plugins/dap.lua @@ -59,23 +59,23 @@ return { end, { desc = "Step out" }) vim.keymap.set("n", "bp", function() require("dap").toggle_breakpoint() - end, { desc = "[B]reak[P]oint" }) + end, { desc = "Breakpoint" }) -- vim.keymap.set("n", "lp", function() -- require("dap").set_breakpoint(nil, nil, vim.fn.input("Log point message: ")) -- end) vim.keymap.set("n", "dr", function() require("dap").repl.open() - end, { desc = "[D]ebug [R]epl" }) + end, { desc = "Debug repl" }) -- vim.keymap.set("n", "dl", function() -- require("dap").run_last() -- end) vim.keymap.set({ "n", "v" }, "dh", function() require("dap.ui.widgets").hover() - end, { desc = "[D]ebug [H]over" }) + end, { desc = "Debug hover" }) vim.keymap.set("n", "df", function() local widgets = require("dap.ui.widgets") widgets.centered_float(widgets.frames) - end, { desc = "[D]ebug [F]rames" }) + end, { desc = "Debug frames" }) vim.api.nvim_create_autocmd("FileType", { pattern = "dap-float", diff --git a/nvim/dot-config/nvim/lua/plugins/gitsigns.lua b/nvim/dot-config/nvim/lua/plugins/gitsigns.lua index 1eb3496..f5b8cb5 100644 --- a/nvim/dot-config/nvim/lua/plugins/gitsigns.lua +++ b/nvim/dot-config/nvim/lua/plugins/gitsigns.lua @@ -26,37 +26,27 @@ return { }, }, init = function() - vim.keymap.set("n", "gs", require("gitsigns.actions").stage_hunk, { desc = "[G]it [S]tage hunk" }) + vim.keymap.set("n", "gs", require("gitsigns.actions").stage_hunk, { desc = "Stage hunk" }) vim.keymap.set("v", "gs", function() require("gitsigns.actions").stage_hunk({ vim.fn.line("."), vim.fn.line("v") }) - end, { desc = "[G]it [S]tage selection" }) + end, { desc = "Stage selection" }) - vim.keymap.set( - "n", - "gS", - require("gitsigns.actions").undo_stage_hunk, - { desc = "[G]it undo [S]tage hunk" } - ) + vim.keymap.set("n", "gS", require("gitsigns.actions").undo_stage_hunk, { desc = "Undo stage hunk" }) - vim.keymap.set("n", "gd", require("gitsigns.actions").preview_hunk, { desc = "[G]it [D]iff hunk" }) + vim.keymap.set("n", "gd", require("gitsigns.actions").preview_hunk, { desc = "Diff hunk" }) - vim.keymap.set( - "n", - "gb", - require("gitsigns.actions").toggle_current_line_blame, - { desc = "[G]it [B]lame" } - ) + vim.keymap.set("n", "gb", require("gitsigns.actions").toggle_current_line_blame, { desc = "Blame" }) - vim.keymap.set("n", "gr", require("gitsigns.actions").reset_hunk, { desc = "[G]it [R]eset hunk" }) + vim.keymap.set("n", "gr", require("gitsigns.actions").reset_hunk, { desc = "Reset hunk" }) vim.keymap.set("v", "gr", function() require("gitsigns.actions").reset_hunk({ vim.fn.line("."), vim.fn.line("v") }) - end, { desc = "[G]it [R]eset selection" }) + end, { desc = "Reset selection" }) vim.keymap.set("n", "]g", function() require("gitsigns.actions").nav_hunk("next") - end, { desc = "Go to next hunk" }) + end, { desc = "Next hunk" }) vim.keymap.set("n", "[g", function() require("gitsigns.actions").nav_hunk("prev") - end, { desc = "Go to previous hunk" }) + end, { desc = "Previous hunk" }) end, } diff --git a/nvim/dot-config/nvim/lua/plugins/guess-indent.lua b/nvim/dot-config/nvim/lua/plugins/guess-indent.lua index cd6eee2..caed361 100644 --- a/nvim/dot-config/nvim/lua/plugins/guess-indent.lua +++ b/nvim/dot-config/nvim/lua/plugins/guess-indent.lua @@ -1,10 +1,10 @@ -- https://github.com/NMAC427/guess-indent.nvim return { - -- Adds a command to automatically detect the identation settings + -- Adds a command to automatically detect the indentation settings -- Prefer to use .editorconfig for projects and modeline for files - 'NMAC427/guess-indent.nvim', + "NMAC427/guess-indent.nvim", keys = { - { "gi", "GuessIndent", desc = "[G]uess [I]ndentation" }, + { "gi", "GuessIndent", desc = "Guess indentation" }, }, opts = { auto_cmd = false, diff --git a/nvim/dot-config/nvim/lua/plugins/lsp.lua b/nvim/dot-config/nvim/lua/plugins/lsp.lua index 31c8cba..6f11e99 100644 --- a/nvim/dot-config/nvim/lua/plugins/lsp.lua +++ b/nvim/dot-config/nvim/lua/plugins/lsp.lua @@ -56,23 +56,23 @@ return { vim.keymap.set("n", keys, func, { buffer = event.buf, desc = "LSP:" .. desc }) end - map("gd", vim.lsp.buf.definition, "[G]oto [D]efinition") - map("gr", require("telescope.builtin").lsp_references, "[G]oto [R]eferences") - map("gI", require("telescope.builtin").lsp_implementations, "[G]oto [I]mplementation") - map("D", vim.lsp.buf.type_definition, "Type [D]efinition") - map("ds", require("telescope.builtin").lsp_document_symbols, "[D]ocument [S]symbols") - map("ws", require("telescope.builtin").lsp_dynamic_workspace_symbols, "[W]orkspace [S]symbols") + map("gd", vim.lsp.buf.definition, "Goto definition") + map("gr", require("telescope.builtin").lsp_references, "Goto references") + map("gI", require("telescope.builtin").lsp_implementations, "Goto implementation") + map("D", vim.lsp.buf.type_definition, "Type definition") + map("ds", require("telescope.builtin").lsp_document_symbols, "Document symbols") + map("ws", require("telescope.builtin").lsp_dynamic_workspace_symbols, "Workspace symbols") vim.keymap.set("n", "rn", function() return ":IncRename " .. vim.fn.expand("") - end, { buffer = event.buf, expr = true, desc = "LSP: [R]e[N]ame" }) + end, { buffer = event.buf, expr = true, desc = "Rename" }) -- TODO: Do we need this to work in visal mode? vim.keymap.set( { "v", "n" }, "ca", vim.lsp.buf.code_action, - { buffer = event.buf, desc = "LSP: [C]ode [A]ction", remap = true } + { buffer = event.buf, desc = "Code actions", remap = true } ) -- Signature help @@ -80,7 +80,7 @@ return { map("", vim.lsp.buf.signature_help, "Signature Documentation") -- Lesser used LSP functionality - map("gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration") + map("gD", vim.lsp.buf.declaration, "Goto declaration") local client = vim.lsp.get_client_by_id(event.data.client_id) -- Turn of lsp based syntax highlighting diff --git a/nvim/dot-config/nvim/lua/plugins/telescope.lua b/nvim/dot-config/nvim/lua/plugins/telescope.lua index 6d8d4ec..5f4336a 100644 --- a/nvim/dot-config/nvim/lua/plugins/telescope.lua +++ b/nvim/dot-config/nvim/lua/plugins/telescope.lua @@ -47,46 +47,36 @@ return { require("telescope").load_extension("fzf") require("telescope").load_extension("ui-select") - vim.keymap.set( - "n", - ".", - require("telescope.builtin").oldfiles, - { desc = "[.] Find recently opened files" } - ) - vim.keymap.set( - "n", - "", - require("telescope.builtin").buffers, - { desc = "[ ] Find existing buffers" } - ) + vim.keymap.set("n", ".", require("telescope.builtin").oldfiles, { desc = "Find recently opened files" }) + vim.keymap.set("n", "sb", require("telescope.builtin").buffers, { desc = "Buffers" }) vim.keymap.set("n", "/", function() require("telescope.builtin").current_buffer_fuzzy_find({ -- Show matches in the order they appear in the document sorting_strategy = "ascending", }) - end, { desc = "[/] Fuzzily search in current buffer" }) + end, { desc = "Fuzzily search in current buffer" }) vim.keymap.set("n", "s/", function() require("telescope.builtin").live_grep({ grep_open_files = true, prompt_title = "Live Grep in Open Files", }) - end, { desc = "[S]earch [/] in Open Files" }) + end, { desc = "Grep in open files" }) - vim.keymap.set("n", "sf", require("telescope.builtin").find_files, { desc = "[S]earch [F]iles" }) - vim.keymap.set("n", "sh", require("telescope.builtin").help_tags, { desc = "[S]earch [H]elp" }) + vim.keymap.set("n", "", require("telescope.builtin").find_files, { desc = "Find files" }) + vim.keymap.set("n", "sh", require("telescope.builtin").help_tags, { desc = "Help" }) vim.keymap.set("n", "sw", function() require("telescope.builtin").grep_string({ -- Show matches in the order they appear in the document sorting_strategy = "ascending", }) - end, { desc = "[S]earch current [W]ord" }) - vim.keymap.set("n", "sg", require("telescope.builtin").live_grep, { desc = "[S]earch by [G]rep" }) - vim.keymap.set("n", "sd", require("telescope.builtin").diagnostics, { desc = "[S]earch [D]iagnostics" }) - vim.keymap.set("n", "sr", require("telescope.builtin").resume, { desc = "[S]earch [R]esume" }) - vim.keymap.set("n", "sk", require("telescope.builtin").keymaps, { desc = "[S]earch [K]eymaps" }) + end, { desc = "Current word" }) + vim.keymap.set("n", "sg", require("telescope.builtin").live_grep, { desc = "Grep" }) + vim.keymap.set("n", "sd", require("telescope.builtin").diagnostics, { desc = "Diagnostics" }) + vim.keymap.set("n", "sr", require("telescope.builtin").resume, { desc = "Resume" }) + vim.keymap.set("n", "sk", require("telescope.builtin").keymaps, { desc = "Keymaps" }) vim.keymap.set("n", "sn", function() require("telescope.builtin").find_files({ cwd = vim.fn.stdpath("config") }) - end, { desc = "[S]earch [N]eovim files" }) + end, { desc = "Neovim files" }) end, } diff --git a/nvim/dot-config/nvim/lua/plugins/todo-comments.lua b/nvim/dot-config/nvim/lua/plugins/todo-comments.lua index 6f30843..d5cc046 100644 --- a/nvim/dot-config/nvim/lua/plugins/todo-comments.lua +++ b/nvim/dot-config/nvim/lua/plugins/todo-comments.lua @@ -23,7 +23,7 @@ return { vim.keymap.set("n", "", "TroubleToggle todo", { desc = "Next todo comment" }) end if pcall(require, "telescope") then - vim.keymap.set("n", "st", "TodoTelescope", { desc = "[S]earch [T]odo" }) + vim.keymap.set("n", "st", "TodoTelescope", { desc = "Search todo" }) end require("todo-comments").setup({ diff --git a/nvim/dot-config/nvim/lua/plugins/which-key.lua b/nvim/dot-config/nvim/lua/plugins/which-key.lua index 166bc72..35bd3a1 100644 --- a/nvim/dot-config/nvim/lua/plugins/which-key.lua +++ b/nvim/dot-config/nvim/lua/plugins/which-key.lua @@ -41,24 +41,16 @@ return { F12 = " ", }, }, + expand = 1, + sort = { "alphanum" }, }, init = function() -- TODO: Only make a category show up if there actually are any keybinds under it require("which-key").add({ - { "b", group = "[B]buffer" }, - { "b_", hidden = true }, - { "c", group = "[C]ode" }, - { "c_", hidden = true }, - { "d", group = "[D]ocument" }, - { "d_", hidden = true }, - { "g", group = "[G]it" }, - { "g_", hidden = true }, - { "r", group = "[R]e[N]ame" }, - { "r_", hidden = true }, - { "s", group = "[S]earch" }, - { "s_", hidden = true }, - { "w", group = "[W]orkspace" }, - { "w_", hidden = true }, + { "b", group = "Buffer" }, + { "d", group = "Document" }, + { "g", group = "Git" }, + { "s", group = "Search" }, }) end, }