diff --git a/basic/nvim/plugconf/lspconfig.lua b/basic/nvim/plugconf/lspconfig.lua
index afe7cbf..2ccf4d8 100644
--- a/basic/nvim/plugconf/lspconfig.lua
+++ b/basic/nvim/plugconf/lspconfig.lua
@@ -4,9 +4,13 @@ vim.api.nvim_create_autocmd('LspAttach', {
   callback = function(ev)
     local opts = { buffer = ev.buf }
     vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
+    vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
+    vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
     vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
     vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
-    vim.keymap.set('n', 'cr', vim.lsp.buf.rename, opts)
-    vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, opts)
+    vim.keymap.set('n', '<leader>r', vim.lsp.buf.rename, opts)
+    vim.keymap.set('n', '<leader>a', vim.lsp.buf.code_action, opts)
+    vim.keymap.set('n', '<leader>n', vim.diagnostic.goto_next, opts)
+    vim.keymap.set('n', '<leader>p', vim.diagnostic.goto_prev, opts)
   end,
 })