diff --git a/home/base/programs/nixvim/default.nix b/home/base/programs/nixvim/default.nix
index 826507d..29b554f 100644
--- a/home/base/programs/nixvim/default.nix
+++ b/home/base/programs/nixvim/default.nix
@@ -13,6 +13,7 @@
     ./plugins/which-key.nix
     ./plugins/project-nvim.nix
     ./plugins/smart-splits.nix
+    ./plugins/telescope.nix
     ./plugins/misc.nix
   ];
 
diff --git a/home/base/programs/nixvim/keymaps.nix b/home/base/programs/nixvim/keymaps.nix
index 80d8e62..2279d8a 100644
--- a/home/base/programs/nixvim/keymaps.nix
+++ b/home/base/programs/nixvim/keymaps.nix
@@ -2,69 +2,12 @@
 
 {
   programs.nixvim.keymaps = [
-    {
-      action = "<cmd>Telescope find_files<CR>";
-      key = "<leader>ff";
-      options = {
-        desc = "Find files";
-      };
-    }
-    {
-      action = "<cmd>Telescope projects<CR>";
-      key = "<leader>fp";
-      options = {
-        desc = "Find projects";
-      };
-    }
-    {
-      action = "<cmd>Telescope buffers<CR>";
-      key = "<leader>fb";
-      options = {
-        desc = "Find buffers";
-      };
-    }
     {
       action = "<cmd>Neotree toggle<CR>";
-      key = "<leader>ft";
+      key = "<leader>t";
       options = {
-        desc = "Toggle neo-tree";
+        desc = "Neotree";
       };
     }      
-    {
-      action = ''
-          <cmd>lua vim.lsp.buf.code_action({ apply = true })<CR>
-      '';
-      key = "<leader>lc";
-      options = {
-        desc = "Apply code actions";
-      };
-    }
-    {
-      action = ''
-          <cmd>lua vim.lsp.buf.format()<CR>
-      '';
-      key = "<leader>lf";
-      options = {
-        desc = "Format buffer";
-      };
-    }
-    {
-      action = ''
-        <cmd>Telescope lsp_definitions<CR>
-      '';
-      key = "gd";
-      options = {
-        desc = "Go to definitions";
-      };
-    }
-    {
-      action = ''
-        <cmd>Telescope lsp_references<CR>
-      '';
-      key = "gr";
-      options = {
-        desc = "Go to references";
-      };
-    }
   ];
 }
diff --git a/home/base/programs/nixvim/plugins/lsp.nix b/home/base/programs/nixvim/plugins/lsp.nix
index 8f733cb..181b7e0 100644
--- a/home/base/programs/nixvim/plugins/lsp.nix
+++ b/home/base/programs/nixvim/plugins/lsp.nix
@@ -11,15 +11,6 @@
             custom_captures = { };
             enable = true;
           };
-          incremental_selection = {
-            enable = true;
-            keymaps = {
-              init_selection = false;
-              node_decremental = "grm";
-              node_incremental = "grn";
-              scope_incremental = "grc";
-            };
-          };
           indent = {
             enable = true;
           };
@@ -37,6 +28,53 @@
           nixd.enable = true;
           lua-ls.enable = true;
         };
+        keymaps = {
+          lspBuf = {
+            K = "hover";
+            gr = {
+              action = "references";
+              desc = "Go to references"; 
+            };
+            gi = { 
+              action = "implementation";
+              desc = "Go to implementation";
+            };
+            gt = {
+              action = "type_definition";
+              desc = "Go to type definition";
+            };
+          };
+          extra = [
+            {
+              action = "<CMD>LspStop<Enter>";
+              key = "<leader>lx";
+              options = {
+                desc = "Stop LSP";
+              };
+            }
+            {
+              action = "<CMD>LspStart<Enter>";
+              key = "<leader>ls";
+              options = {
+                desc = "Start LSP";
+              };
+            }
+            {
+              action = "<CMD>LspRestart<Enter>";
+              key = "<leader>lr";
+              options = {
+                desc = "Restart LSP";
+              };
+            }
+            {
+              action = "<CMD>Telescope lsp_definitions<Enter>";
+              key = "gd";
+              options = {
+                desc = "Go to definitions";
+              };
+            }
+          ];
+        };
       };
       cmp = {
         enable = true;
diff --git a/home/base/programs/nixvim/plugins/telescope.nix b/home/base/programs/nixvim/plugins/telescope.nix
new file mode 100644
index 0000000..ddc7854
--- /dev/null
+++ b/home/base/programs/nixvim/plugins/telescope.nix
@@ -0,0 +1,39 @@
+{ ... }:
+
+{
+  programs.nixvim.plugins.telescope = {
+    enable = true;
+    keymaps = {
+      "<C-p>" = {
+        action = "git_files";
+        options = {
+          desc = "Telescope Git Files";
+        };
+      };
+      "<leader>fg" = {
+        action = "live_grep";
+        options = {
+          desc = "Live grep";
+        };
+      };
+      "<leader>ff" = {
+        action = "find_files";
+        options = {
+          desc = "Find files";
+        };
+      };
+      "<leader>fp" = {
+        action = "projects";
+        options = {
+          desc = "Find projects";
+        };
+      };
+      "<leader>fb" = {
+        action = "buffers";
+        options = {
+          desc = "Find buffers";
+        };
+      };
+    };
+  };
+}
diff --git a/home/base/programs/nixvim/plugins/which-key.nix b/home/base/programs/nixvim/plugins/which-key.nix
index c80ecfd..7409568 100644
--- a/home/base/programs/nixvim/plugins/which-key.nix
+++ b/home/base/programs/nixvim/plugins/which-key.nix
@@ -20,7 +20,7 @@
       spec = [
         {
           __unkeyed = "<leader>f";
-          group = "Find";
+          group = "Telescope";
         }
         {
           __unkeyed = "<leader>l";