diff --git a/home-manager/common/software/cli/nixvim.nix b/home-manager/common/software/cli/nixvim.nix
index 91bda5c3..6105b694 100644
--- a/home-manager/common/software/cli/nixvim.nix
+++ b/home-manager/common/software/cli/nixvim.nix
@@ -54,8 +54,6 @@
             # Fugitive
             (nmap "<leader>gc" ":Git commit -a<CR>" // desc "[C]ommit" )
             (nmap "<leader>gp" ":Git push<CR>" // desc "[P]ush")
-            # LSP
-            (nmap "<leader>lh" "vim.lsp.buf.hover()" // desc "LSP [H]over")
         ];
 
         options = {
@@ -154,6 +152,18 @@
                     cssls.enable = true;
                     bashls.enable = true;
                 };
+                keymaps = {
+                    silent = true;
+                    diagnostic = {
+                        "<leader>k" = "goto_prev";
+                        "<leader>j" = "goto_next";
+                    };
+
+                    lspBuf = {
+                        gd = "definition";
+                        K = "hover";
+                    };
+                };
             };
 
             nvim-cmp = {