Merge branch 'main' of /var/git/dotfiles

1 files changed, 24 insertions, 0 deletions

diff --git a/config/essentials/nvim/lua/user/cmp/setup.lua b/config/essentials/nvim/lua/user/cmp/setup.lua
index 8f8291e..36d55e3 100644
--- a/config/essentials/nvim/lua/user/cmp/setup.lua
+++ b/config/essentials/nvim/lua/user/cmp/setup.lua
@@ -42,3 +42,27 @@ cmp.setup.cmdline(':', {
 		{ name = 'cmdline', keyword_length = 4 }
 	}),
 })
+
+local function nnoremap(rhs, lhs, bufopts, desc)
+  bufopts.desc = desc
+  vim.keymap.set("n", rhs, lhs, bufopts)
+end
+
+-- Regular Neovim LSP client keymappings
+local bufopts = { noremap=true, silent=true }
+nnoremap('gD', vim.lsp.buf.declaration, bufopts, "Go to declaration")
+nnoremap('gd', vim.lsp.buf.definition, bufopts, "Go to definition")
+nnoremap('gi', vim.lsp.buf.implementation, bufopts, "Go to implementation")
+nnoremap('K', vim.lsp.buf.hover, bufopts, "Hover text")
+nnoremap('<C-k>', vim.lsp.buf.signature_help, bufopts, "Show signature")
+nnoremap('<leader>wa', vim.lsp.buf.add_workspace_folder, bufopts, "Add workspace folder")
+nnoremap('<leader>wr', vim.lsp.buf.remove_workspace_folder, bufopts, "Remove workspace folder")
+nnoremap('<leader>wl', function()
+print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+end, bufopts, "List workspace folders")
+nnoremap('<leader>D', vim.lsp.buf.type_definition, bufopts, "Go to type definition")
+nnoremap('<leader>rn', vim.lsp.buf.rename, bufopts, "Rename")
+nnoremap('<leader><Return>', vim.lsp.buf.code_action, bufopts, "Code actions")
+vim.keymap.set('v', "<leader><Return>", "<ESC><CMD>lua vim.lsp.buf.range_code_action()<CR>",
+{ noremap=true, silent=true, desc = "Code actions" })
+nnoremap('<leader>f', function() vim.lsp.buf.format { async = true } end, bufopts, "Format file")