diff --git a/lua/lsp.lua b/lua/lsp.lua index 62f128b..bf6ae06 100644 --- a/lua/lsp.lua +++ b/lua/lsp.lua @@ -43,22 +43,30 @@ local on_attach = function(_, bufnr) end -- document existing key chains -require('which-key').register { - ['c'] = { name = '[C]ode', _ = 'which_key_ignore' }, - ['d'] = { name = '[D]ocument', _ = 'which_key_ignore' }, - ['g'] = { name = '[G]it', _ = 'which_key_ignore' }, - ['h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' }, - ['r'] = { name = '[R]ename', _ = 'which_key_ignore' }, - ['s'] = { name = '[S]earch', _ = 'which_key_ignore' }, - ['t'] = { name = '[T]oggle', _ = 'which_key_ignore' }, - ['w'] = { name = '[W]orkspace', _ = 'which_key_ignore' }, +require('which-key').add { + { "c", group = "[C]ode" }, + { "c_", hidden = true }, + { "d", group = "[D]ocument" }, + { "d_", hidden = true }, + { "g", group = "[G]it" }, + { "g_", hidden = true }, + { "h", group = "Git [H]unk" }, + { "h_", hidden = true }, + { "r", group = "[R]ename" }, + { "r_", hidden = true }, + { "s", group = "[S]earch" }, + { "s_", hidden = true }, + { "t", group = "[T]oggle" }, + { "t_", hidden = true }, + { "w", group = "[W]orkspace" }, + { "w_", hidden = true }, } -- register which-key VISUAL mode -- required for visual hs (hunk stage) to work -require('which-key').register({ - [''] = { name = 'VISUAL ' }, - ['h'] = { 'Git [H]unk' }, -}, { mode = 'v' }) +require('which-key').add { + { "", group = "VISUAL ", mode = "v" }, + { "h", desc = "Git [H]unk", mode = "v" }, +} -- mason-lspconfig requires that these setup functions are called in this order -- before setting up the servers. diff --git a/lua/neorg-configure.lua b/lua/neorg-configure.lua index ac0f5c4..6316a50 100644 --- a/lua/neorg-configure.lua +++ b/lua/neorg-configure.lua @@ -14,11 +14,15 @@ vim.api.nvim_create_autocmd({ "FileType" }, { }) -- document existing key chains -require('which-key').register { - ['n'] = { name = '[N]eorg', _ = 'which_key_ignore' }, - ['m'] = { name = 'neorg [M]ode', _ = 'which_key_ignore' }, - ['l'] = { name = 'neorg [L]ist', _ = 'which_key_ignore' }, - ['ne'] = { name = '[N]eorg [E]xport', _ = 'which_key_ignore' }, +require('which-key').add { + { "l", group = "neorg [L]ist" }, + { "l_", hidden = true }, + { "m", group = "neorg [M]ode" }, + { "m_", hidden = true }, + { "n", group = "[N]eorg" }, + { "n_", hidden = true }, + { "ne", group = "[N]eorg [E]xport" }, + { "ne_", hidden = true }, } vim.api.nvim_set_keymap("n", "ni", ":Neorg index", diff --git a/lua/which-key-configure.lua b/lua/which-key-configure.lua index cc53eb9..65f76b9 100644 --- a/lua/which-key-configure.lua +++ b/lua/which-key-configure.lua @@ -87,4 +87,7 @@ local options = { }, } +-- XXX: temporary until upgrading the deprecated configuration aboveā€¦ +options = {} + return options