4 files changed, 45 insertions, 46 deletions
diff --git a/dot_config/nvim/lua/bindings/builtins.lua b/dot_config/nvim/lua/bindings/builtins.lua
index 330666e..1b13f9b 100644
--- a/dot_config/nvim/lua/bindings/builtins.lua
+++ b/dot_config/nvim/lua/bindings/builtins.lua
@@ -1,7 +1,5 @@
 -- document missing builtins
-require 'which-key'.register {
-	['g'] = {
-		t = 'Next tab',
-		T = 'Previous tab',
-	},
+require 'which-key'.add {
+	{ 'gt', desc = 'Next tab' },
+	{ 'gT', desc = 'Previous tab' },
 }
diff --git a/dot_config/nvim/lua/bindings/init.lua b/dot_config/nvim/lua/bindings/init.lua
index 01b83b0..4108782 100644
--- a/dot_config/nvim/lua/bindings/init.lua
+++ b/dot_config/nvim/lua/bindings/init.lua
@@ -6,12 +6,10 @@ for _, v in ipairs {
 end
 
 -- general bindings that aren't specific to a plugin
-require 'which-key'.register {
+require 'which-key'.add {
 	-- diagnostics
-	['<leader>'] = {
-		e = { vim.diagnostic.open_float, 'diag float' },
-		q = { vim.diagnostic.setloclist, 'diag locations' },
-	},
-	['[d'] = { vim.diagnostic.goto_prev, 'prev diag' },
-	[']d'] = { vim.diagnostic.goto_next, 'next diag' },
+	{ '<leader>e', vim.diagnostic.open_float, desc = 'diag float' },
+	{ '<leader>q', vim.diagnostic.setloclist, desc = 'diag locations' },
+	{ '[d', vim.diagnostic.goto_prev, desc = 'prev diag' },
+	{ ']d', vim.diagnostic.goto_next, desc = 'next diag' },
 }
diff --git a/dot_config/nvim/lua/bindings/plugins.lua b/dot_config/nvim/lua/bindings/plugins.lua
index 52894a7..4d4de72 100644
--- a/dot_config/nvim/lua/bindings/plugins.lua
+++ b/dot_config/nvim/lua/bindings/plugins.lua
@@ -1,6 +1,4 @@
 -- plugin-specific category bindings
-require 'which-key'.register {
-	['<leader>'] = {
-		f = '+find',
-	},
+require 'which-key'.add {
+	{ '<leader>f', desc = '+find' },
 }
diff --git a/dot_config/nvim/lua/plugins/lsp/attach.lua b/dot_config/nvim/lua/plugins/lsp/attach.lua
index 66d5a44..e81b154 100644
--- a/dot_config/nvim/lua/plugins/lsp/attach.lua
+++ b/dot_config/nvim/lua/plugins/lsp/attach.lua
@@ -1,36 +1,41 @@
+local function helper(opts, ...)
+	for _, spec in ipairs({...}) do
+		for _, v in ipairs(spec) do
+			if opts.prefix then
+				v[0] = opts.prefix .. v[0]
+			end
+			if opts.buffer then
+				v.buffer = opts.buffer
+			end
+		end
+	end
+end
+
 return function(c, b)
 	local lsp = vim.lsp
 	local lbf = lsp.buf
 	local wk  = require 'which-key'
 	vim.api.nvim_buf_set_option(b, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-	wk.register({
-		name = '+lsp',
-		D = {lbf.declaration, 'goto declaration'},
-		d = {lbf.definition, 'goto definition'},
-		k = {lbf.hover, 'hover'},
-		K = {lbf.signature_help, 'signature help'},
-		i = {lbf.implementation, 'goto implementation'},
-		t = {lbf.type_definition, 'goto type definition'},
-		r = {lbf.rename, 'rename'},
-		c = {lbf.code_action, 'code action'},
-		R = {lbf.references, 'list references'},
-		w = {
-			name = '+workspace',
-			a = {lbf.add_workspace_folder, 'add folder'},
-			r = {lbf.remove_workspace_folder, 'remove folder'},
-			l = {
-				function() print(vim.inspect(lbf.list_workspace_folders())) end,
-				'list folders'
-			},
-		},
-	}, {
-	prefix = '<localleader><localleader>',
-		buffer = b,
-	})
-	wk.register({
-		['<leader>F'] = {
-			function() vim.lsp.buf.format {async = true} end,
-			'run format',
-		},
-	}, { buffer = b })
+	wk.add(helper({buffer = b}, {
+		{ '<leader>F', function() vim.lsp.buf.format {async = true} end,
+		  desc = 'run format' },
+	}, helper({prefix = '<localleader><localleader>'}, {
+		{ '', group = '+lsp' },
+		{ 'w', group = '+workspace' },
+
+		{ 'D', lbf.declaration, desc = 'goto declaration' },
+		{ 'd', lbf.definition, desc = 'goto definition' },
+		{ 'k', lbf.hover, desc = 'hover' },
+		{ 'K', lbf.signature_help, desc = 'signature help' },
+		{ 'i', lbf.implementation, desc = 'goto implementation' },
+		{ 't', lbf.type_definition, desc = 'goto type definition' },
+		{ 'r', lbf.rename, desc = 'rename' },
+		{ 'c', lbf.code_action, desc = 'code action' },
+		{ 'R', lbf.references, desc = 'list references' },
+
+		{ 'wa', lbf.add_workspace_folder, 'add folder' },
+		{ 'wr', lbf.remove_workspace_folder, 'remove folder' },
+		{ 'wl', function() print(vim.inspect(lbf.list_workspace_folders())) end,
+		  desc = 'list folders' },
+	})))
 end