diff --git a/lua/plugins/barbar.lua b/lua/plugins/barbar.lua index 098cbe5..be8216e 100644 --- a/lua/plugins/barbar.lua +++ b/lua/plugins/barbar.lua @@ -42,13 +42,13 @@ return { map('n', '', 'BufferLast', 'Goto Last Buffer') map('n', '', 'BufferPin', 'Pin/Unpin Buffer') - map('n', 'bp', 'BufferPin', 'Toggle [P]in') + map('n', 'bp', 'BufferPin', 'Buffer: Toggle [P]in') map('n', '', 'BufferClose', 'Close Current Buffer') - map('n', 'bd', 'BufferClose', 'Close Current Buffer') + map('n', 'bd', 'BufferClose', 'Buffer: Close Current Buffer') - map('n', 'bc', 'BufferCloseAllButCurrentOrPined', 'Close Other Buffers') - map('n', 'ba', 'BufferCloseAllBunPinned', 'Close All Buffers') + map('n', 'bc', 'BufferCloseAllButCurrentOrPined', 'Buffer: Close Other Buffers') + map('n', 'ba', 'BufferCloseAllBunPinned', 'Buffer: Close All Buffers') end, }, } diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua index b371c71..9d0497d 100644 --- a/lua/plugins/gitsigns.lua +++ b/lua/plugins/gitsigns.lua @@ -39,25 +39,25 @@ return { -- visual mode map('v', 'hs', function() gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } - end, { desc = 'stage git hunk' }) + end, { desc = 'Git: [s]tage git hunk' }) map('v', 'hr', function() gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } - end, { desc = 'reset git hunk' }) + end, { desc = 'Git: [r]eset git hunk' }) -- normal mode - map('n', 'hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' }) - map('n', 'hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' }) - map('n', 'hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' }) - map('n', 'hu', gitsigns.undo_stage_hunk, { desc = 'git [u]ndo stage hunk' }) - map('n', 'hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' }) - map('n', 'hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' }) - map('n', 'hb', gitsigns.blame_line, { desc = 'git [b]lame line' }) - map('n', 'hd', gitsigns.diffthis, { desc = 'git [d]iff against index' }) + map('n', 'hs', gitsigns.stage_hunk, { desc = 'Git: [s]tage hunk' }) + map('n', 'hr', gitsigns.reset_hunk, { desc = 'Git: [r]eset hunk' }) + map('n', 'hS', gitsigns.stage_buffer, { desc = 'Git: [S]tage buffer' }) + map('n', 'hu', gitsigns.undo_stage_hunk, { desc = 'Git: [u]ndo stage hunk' }) + map('n', 'hR', gitsigns.reset_buffer, { desc = 'Git: [R]eset buffer' }) + map('n', 'hp', gitsigns.preview_hunk, { desc = 'Git: [p]review hunk' }) + map('n', 'hb', gitsigns.blame_line, { desc = 'Git: [b]lame line' }) + map('n', 'hd', gitsigns.diffthis, { desc = 'Git: [d]iff against index' }) map('n', 'hD', function() gitsigns.diffthis '@' - end, { desc = 'git [D]iff against last commit' }) + end, { desc = 'Git: [D]iff against last commit' }) -- Toggles - map('n', 'tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' }) - map('n', 'tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' }) + map('n', 'tb', gitsigns.toggle_current_line_blame, { desc = 'Toggle: Git show [b]lame line' }) + map('n', 'tD', gitsigns.toggle_deleted, { desc = 'Toggle: Git show [D]eleted' }) end, }, }, diff --git a/lua/plugins/indent-blankline.lua b/lua/plugins/indent-blankline.lua index 04bbd42..cec449c 100644 --- a/lua/plugins/indent-blankline.lua +++ b/lua/plugins/indent-blankline.lua @@ -8,7 +8,7 @@ return { vim.keymap.set('n', 'ti', function() local enabled = require('ibl.config').get_config(0).enabled require('ibl').setup_buffer(0, { enabled = not enabled }) - end, { desc = '[T]oggle [I]ndentation Guides' }) + end, { desc = 'Toggle: [i]ndentation Guides' }) return { enabled = false, diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 1cc8a50..600479a 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -38,45 +38,45 @@ return { callback = function(event) local map = function(keys, func, desc, mode) mode = mode or 'n' - vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) + vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = desc }) end -- Jump to the definition of the word under your cursor. -- This is where a variable was first declared, or where a function is defined, etc. -- To jump back, press . - map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') + map('gd', require('telescope.builtin').lsp_definitions, 'LSP: [G]oto [D]efinition') -- WARN: This is not Goto Definition, this is Goto Declaration. -- For example, in C this would take you to the header. map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') -- Find references for the word under your cursor. - map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') + map('gr', require('telescope.builtin').lsp_references, 'LSP: [G]oto [R]eferences') -- Jump to the implementation of the word under your cursor. -- Useful when your language has ways of declaring types without an actual implementation. - map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') + map('gI', require('telescope.builtin').lsp_implementations, 'LSP: [G]oto [I]mplementation') -- Jump to the type of the word under your cursor. -- Useful when you're not sure what type a variable is and you want to see -- the definition of its *type*, not where it was *defined*. - map('lt', require('telescope.builtin').lsp_type_definitions, '[T]ype Definition') + map('lt', require('telescope.builtin').lsp_type_definitions, 'LSP: [T]ype Definition') -- Fuzzy find all the symbols in your current document. -- Symbols are things like variables, functions, types, etc. - map('ld', require('telescope.builtin').lsp_document_symbols, '[D]ocument Symbols') + map('ld', require('telescope.builtin').lsp_document_symbols, 'LSP: [D]ocument Symbols') -- Fuzzy find all the symbols in your current workspace. -- Similar to document symbols, except searches over your entire project. - map('lw', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace Symbols') + map('lw', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'LSP: [W]orkspace Symbols') -- Rename the variable under your cursor. -- Most Language Servers support renaming across files, etc. - map('lr', vim.lsp.buf.rename, '[R]ename') + map('lr', vim.lsp.buf.rename, 'LSP: [R]ename') -- Execute a code action, usually your cursor needs to be on top of an error -- or a suggestion from your LSP for this to activate. - map('la', vim.lsp.buf.code_action, 'Code [A]ction', { 'n', 'x' }) + map('la', vim.lsp.buf.code_action, 'LSP: Code [A]ction', { 'n', 'x' }) -- The following two autocommands are used to highlight references of the -- word under your cursor when your cursor rests there for a little while. @@ -110,7 +110,7 @@ return { if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then map('th', function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) - end, '[T]oggle Inlay [H]ints') + end, 'Toggle: Inlay [H]ints') end end, }) diff --git a/lua/plugins/nvim-colorizer.lua b/lua/plugins/nvim-colorizer.lua index b468263..879fd74 100644 --- a/lua/plugins/nvim-colorizer.lua +++ b/lua/plugins/nvim-colorizer.lua @@ -5,7 +5,7 @@ return { -- no need to call this plugin's setup() apparently unless you want automatic buffer -- attaching based on filetype. and to customize the default options. - vim.keymap.set('n', 'tc', 'ColorizerToggle', { desc = '[T]oggle [C]olor Previewing' }) + vim.keymap.set('n', 'tc', 'ColorizerToggle', { desc = 'Toggle: [C]olor Previewing' }) end, }, } diff --git a/lua/plugins/nvim-dap.lua b/lua/plugins/nvim-dap.lua index e94f6f7..38c8aa3 100644 --- a/lua/plugins/nvim-dap.lua +++ b/lua/plugins/nvim-dap.lua @@ -35,21 +35,21 @@ return { { '', dapui.toggle, desc = 'Debug: Toggle Debug UI' }, -- Breakpoints - { 'db', dap.toggle_breakpoint, desc = 'Toggle [B]reakpoint' }, + { 'db', dap.toggle_breakpoint, desc = 'Debug: Toggle [B]reakpoint' }, { 'dB', function() dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ') end, - desc = 'Set [B]reakpoint', + desc = 'Debug: Set [B]reakpoint', }, - { 'dc', dap.clear_breakpoints, desc = '[C]lear All Breakpoints' }, + { 'dc', dap.clear_breakpoints, desc = 'Debug: [C]lear All Breakpoints' }, { 'dl', function() dap.list_breakpoints(true) end, - desc = '[L]ist Breakpoints', + desc = 'Debug: [L]ist Breakpoints', }, unpack(keys), diff --git a/lua/plugins/nvim-notify.lua b/lua/plugins/nvim-notify.lua index f30d33f..0fb0616 100644 --- a/lua/plugins/nvim-notify.lua +++ b/lua/plugins/nvim-notify.lua @@ -6,7 +6,7 @@ return { function() vim.cmd 'Telescope notify' end, - desc = '[S]earch Notification Histor[y]', + desc = 'Search: Notification Histor[y]', }, }, opts = { diff --git a/lua/plugins/outline.lua b/lua/plugins/outline.lua index 274a5b6..7c8865e 100644 --- a/lua/plugins/outline.lua +++ b/lua/plugins/outline.lua @@ -11,7 +11,7 @@ return { }, } - vim.keymap.set('n', 'to', 'Outline', { desc = 'Toggle [O]utline' }) + vim.keymap.set('n', 'to', 'Outline', { desc = 'Toggle: [O]utline' }) vim.keymap.set('n', '', 'Outline', { desc = 'Toggle Outline', noremap = true }) end, }, diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 326c605..bdaadb0 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -69,16 +69,16 @@ return { -- See `:help telescope.builtin` local builtin = require 'telescope.builtin' - vim.keymap.set('n', 'sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) - vim.keymap.set('n', 'sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) - vim.keymap.set('n', 'sf', builtin.find_files, { desc = '[S]earch [F]iles' }) - vim.keymap.set('n', 'ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) - vim.keymap.set('n', 'sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) - vim.keymap.set('n', 'sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) - vim.keymap.set('n', 'sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) - vim.keymap.set('n', 'sr', builtin.resume, { desc = '[S]earch [R]esume' }) - vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) - vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) + vim.keymap.set('n', 'sh', builtin.help_tags, { desc = 'Search: [H]elp' }) + vim.keymap.set('n', 'sk', builtin.keymaps, { desc = 'Search: [K]eymaps' }) + vim.keymap.set('n', 'sf', builtin.find_files, { desc = 'Search: [F]iles' }) + vim.keymap.set('n', 'ss', builtin.builtin, { desc = 'Search: [S]elect Telescope' }) + vim.keymap.set('n', 'sw', builtin.grep_string, { desc = 'Search: Current [W]ord' }) + vim.keymap.set('n', 'sg', builtin.live_grep, { desc = 'Search: By [G]rep' }) + vim.keymap.set('n', 'sd', builtin.diagnostics, { desc = 'Search: [D]iagnostics' }) + vim.keymap.set('n', 'sr', builtin.resume, { desc = 'Search: [R]esume' }) + vim.keymap.set('n', 's.', builtin.oldfiles, { desc = 'Search: Recent Files ("." for repeat)' }) + vim.keymap.set('n', '', builtin.buffers, { desc = 'Find existing buffers' }) -- Slightly advanced example of overriding default behavior and theme vim.keymap.set('n', '/', function() @@ -96,12 +96,12 @@ return { grep_open_files = true, prompt_title = 'Live Grep in Open Files', } - end, { desc = '[S]earch [/] in Open Files' }) + end, { desc = 'Search: [/] In Open Files' }) -- Shortcut for searching your Neovim configuration files vim.keymap.set('n', 'sn', function() builtin.find_files { cwd = vim.fn.stdpath 'config' } - end, { desc = '[S]earch [N]eovim files' }) + end, { desc = 'Search: [N]eovim files' }) end, }, } diff --git a/lua/plugins/todo-comments.lua b/lua/plugins/todo-comments.lua index 02e12b2..4901292 100644 --- a/lua/plugins/todo-comments.lua +++ b/lua/plugins/todo-comments.lua @@ -6,7 +6,7 @@ return { 'nvim-lua/plenary.nvim', }, keys = { - { 'sc', 'TodoTelescope', desc = '[S]earch Todo [C]omments' }, + { 'sc', 'TodoTelescope', desc = 'Search: Todo [C]omments' }, }, opts = { signs = false, diff --git a/lua/plugins/toggleterm.lua b/lua/plugins/toggleterm.lua index 339cdbf..87dea21 100644 --- a/lua/plugins/toggleterm.lua +++ b/lua/plugins/toggleterm.lua @@ -7,7 +7,7 @@ return { } local toggleterm = require 'toggleterm' - vim.keymap.set('n', 'tt', toggleterm.toggle, { desc = '[T]oggle Terminal' }) + vim.keymap.set('n', 'tt', toggleterm.toggle, { desc = 'Toggle: Terminal' }) vim.api.nvim_create_autocmd('TermOpen', { desc = 'Set toggleterm keymaps on terminal open', diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua index e7ed381..9989a7c 100644 --- a/lua/plugins/trouble.lua +++ b/lua/plugins/trouble.lua @@ -3,10 +3,10 @@ return { 'folke/trouble.nvim', cmd = 'Trouble', keys = { - { 'tg', 'Trouble diagnostics toggle pinned=true filter.buf=0', desc = 'Toggle Dia[g]nostics for Buffer' }, + { 'tg', 'Trouble diagnostics toggle pinned=true filter.buf=0', desc = 'Toggle: Dia[g]nostics for Buffer' }, { '', 'Trouble diagnostics toggle pinned=true filter.buf=0', desc = 'Toggle Diagnostics for Buffer' }, - { 'tG', 'Trouble diagnostics toggle', desc = 'Toggle Dia[g]nostics' }, - { 'tq', 'Trouble qflist toggle', desc = 'Toggle [Q]uickfixes' }, + { 'tG', 'Trouble diagnostics toggle', desc = 'Toggle: Dia[g]nostics' }, + { 'tq', 'Trouble qflist toggle', desc = 'Toggle: [Q]uickfixes' }, }, opts = { focus = true,