whichkey actual fix

This commit is contained in:
Christoph J. Scherr 2024-07-08 15:35:14 +02:00
parent 3a8b4acf3d
commit 77f0411be1
2 changed files with 51 additions and 26 deletions

View File

@ -92,7 +92,7 @@ return {
vim.keymap.set('n', '<localleader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' }) vim.keymap.set('n', '<localleader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' })
vim.keymap.set('n', '<localleader>fb', builtin.buffers, { desc = '[F]ind existing [B]uffers' }) vim.keymap.set('n', '<localleader>fb', builtin.buffers, { desc = '[F]ind existing [B]uffers' })
vim.keymap.set('n', '<localleader>fm', builtin.marks, { desc = '[F]ind book[M]arks' }) vim.keymap.set('n', '<localleader>fm', builtin.marks, { desc = '[F]ind book[M]arks' })
vim.keymap.set('n', '<localleader>fd', builtin.diagnostics, { desc = '[F]ind LSP [D]iagnostigs' }) vim.keymap.set('n', '<localleader>fd', builtin.diagnostics, { desc = '[F]ind [D]iagnostigs' })
vim.keymap.set('n', '<localleader>fs', builtin.lsp_dynamic_workspace_symbols, { desc = '[F]ind LSP [S]ymbols' }) vim.keymap.set('n', '<localleader>fs', builtin.lsp_dynamic_workspace_symbols, { desc = '[F]ind LSP [S]ymbols' })
-- spelling -- spelling

View File

@ -141,23 +141,6 @@ return {
{ {
'folke/which-key.nvim', 'folke/which-key.nvim',
event = 'VimEnter', -- Sets the loading event to 'VimEnter' event = 'VimEnter', -- Sets the loading event to 'VimEnter'
keys = { '<leader>', '<localleader>', '<c-r>', '<c-w>', '"', "'", '`', 'c', 'v', 'g' },
defaults = {
mode = { 'n', 'v' },
[';'] = { name = '+telescope' },
[';f'] = { name = '+find' },
['g'] = { name = '+goto' },
[']'] = { name = '+next' },
['['] = { name = '+prev' },
['<leader>d'] = { name = '+[D]ebug' },
['<leader>c'] = { name = '+[C]ode/[C]olor' },
['<leader>g'] = { name = '+[G]ood tools' },
['<leader>f'] = { name = '+[F]ormatting' },
['<leader>r'] = { name = '[R]ename' },
['<localleader>f'] = { name = '[F]ind' },
['<leader>w'] = { name = '[W]orkspace' },
['<leader>t'] = { name = '[T]oggle' },
},
opts = { opts = {
triggers_nowait = { triggers_nowait = {
-- marks -- marks
@ -180,7 +163,51 @@ return {
v = { 'j', 'k' }, v = { 'j', 'k' },
n = { 'o', 'O' }, n = { 'o', 'O' },
}, },
-- plugins = {
-- marks = true, -- shows a list of your marks on ' and `
-- registers = true, -- shows your registers on " in NORMAL or <C-r> in INSERT mode
-- -- the presets plugin, adds help for a bunch of default keybindings in Neovim
-- -- No actual key bindings are created
-- spelling = {
-- enabled = true, -- enabling this will show WhichKey when pressing z= to select spelling suggestions
-- suggestions = 20, -- how many suggestions should be shown in the list?
-- },
-- presets = {
-- operators = true, -- adds help for operators like d, y, ...
-- motions = true, -- adds help for motions
-- text_objects = true, -- help for text objects triggered after entering an operator
-- windows = true, -- default bindings on <c-w>
-- nav = true, -- misc bindings to work with windows
-- z = true, -- bindings for folds, spelling and others prefixed with z
-- g = true, -- bindings for prefixed with g
-- },
-- },
icons = {
breadcrumb = '»', -- symbol used in the command line area that shows your active key combo
separator = '', -- symbol used between a key and it's label
group = '+', -- symbol prepended to a group
},
}, },
config = function(opts)
local wk = require 'which-key'
local defaults = {
mode = { 'n', 'v' },
[';'] = { name = '+telescope' },
[';f'] = { name = '+find' },
['g'] = { name = '+goto' },
[']'] = { name = '+next' },
['['] = { name = '+prev' },
['<leader>d'] = { name = '+[D]ebug' },
['<leader>c'] = { name = '+[C]ode/[C]olor' },
['<leader>g'] = { name = '+[G]ood tools' },
['<leader>f'] = { name = '+[F]ormatting' },
['<leader>r'] = { name = '[R]ename' },
['<localleader>f'] = { name = '[F]ind' },
['<leader>w'] = { name = '[W]orkspace' },
['<leader>t'] = { name = '[T]oggle', ['🚫'] = 'which_key_ignore' },
}
wk.register(defaults, opts)
end,
}, },
{ {
'echasnovski/mini.trailspace', 'echasnovski/mini.trailspace',
@ -294,14 +321,12 @@ return {
'folke/todo-comments.nvim', 'folke/todo-comments.nvim',
lazy = false, lazy = false,
dependencies = 'nvim-telescope/telescope.nvim', dependencies = 'nvim-telescope/telescope.nvim',
-- stylua: ignore -- stylua: ignore
keys = { keys = {
{ ']t', function() require('todo-comments').jump_next() end, desc = 'Next todo comment' }, { ']t', function() require('todo-comments').jump_next() end, desc = 'Next todo comment' },
{ '[t', function() require('todo-comments').jump_prev() end, desc = 'Previous todo comment' }, { '[t', function() require('todo-comments').jump_prev() end, desc = 'Previous todo comment' },
{ '<LocalLeader>fdt', '<cmd>TodoTelescope<CR>', desc = 'todo' }, { '<LocalLeader>fdt', '<cmd>TodoTelescope<CR>', desc = 'todo' },
{ '<leader>xt', '<cmd>TodoTrouble<CR>', desc = 'Todo (Trouble)' }, },
{ '<leader>xT', '<cmd>TodoTrouble keywords=TODO,FIX,FIXME<cr>', desc = 'Todo/Fix/Fixme (Trouble)' },
},
opts = { opts = {
signs = true, signs = true,
keywords = { keywords = {