2026-01-29

home/nixvim/keymaps.nix

@@ -1,4 +1,4 @@
-{...}: {
+{ ... }: {
   programs.nixvim.globals.mapleader = " ";
 
   programs.nixvim.keymaps = [

home/nixvim/plugins/cmp/default.nix

@@ -1,40 +1,42 @@
 {...}: {
+  imports = [
+    ./keymaps.nix
+  ];
+
   programs.nixvim.plugins = {
     lspkind.enable = true;
 
-    blink-cmp.enable = true;
+    cmp-nvim-lsp-signature-help.enable = true;
 
-    # cmp-nvim-lsp-signature-help.enable = true;
-    #
-    # cmp = {
-    #   enable = true;
-    #   autoEnableSources = true;
-    #   autoLoad = true;
-    #
-    #   settings.sources = [
-    #     { name = "nvim_lsp"; }
-    #     { name = "nvim_lsp_signature_help"; }
-    #     { name = "path"; }
-    #   ];
-    #
-    #   settings.mapping = {
-    #     "<Tab>" = "cmp.mapping.select_next_item()";
-    #     "<S-Tab>" = "cmp.mapping.select_prev_item()";
-    #     "<C-Space>" = "cmp.mapping.complete()";
-    #     "<C-S-Space>" = "cmp.mapping.close()";
-    #     "<CR>" = "cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = true })";
-    #   };
-    # };
-    #
-    # lsp-format.enable = true;
-    #
-    # none-ls = {
-    #   enable = true;
-    #   enableLspFormat = true;
-    #   sources.formatting = {
-    #     alejandra.enable = true;
-    #     nixpkgs_fmt.enable = true;
-    #   };
-    # };
+    cmp = {
+      enable = true;
+      autoEnableSources = true;
+      autoLoad = true;
+
+      settings.sources = [
+        {name = "nvim_lsp";}
+        {name = "nvim_lsp_signature_help";}
+        {name = "path";}
+      ];
+
+      settings.mapping = {
+        "<Tab>" = "cmp.mapping.select_next_item()";
+        "<S-Tab>" = "cmp.mapping.select_prev_item()";
+        "<C-Space>" = "cmp.mapping.complete()";
+        "<C-S-Space>" = "cmp.mapping.close()";
+        "<CR>" = "cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = true })";
+      };
+    };
+
+    lsp-format.enable = true;
+
+    none-ls = {
+      enable = true;
+      enableLspFormat = true;
+      sources.formatting = {
+        alejandra.enable = true;
+        nixpkgs_fmt.enable = true;
+      };
+    };
   };
 }

home/nixvim/plugins/cmp/keymaps.nix

@@ -0,0 +1,16 @@
+{...}: {
+  programs.nixvim.keymaps = [
+    {
+      key = "grd";
+      action = "<cmd>Telescope lsp_definitions<CR>";
+      mode = "n";
+      options.desc = "LSP: [G]oto [D]efinition";
+    }
+    {
+      key = "gri";
+      action = "<cmd>Telescope lsp_implementations<CR>";
+      mode = "n";
+      options.desc = "LSP: [G]oto [I]mplementations";
+    }
+  ];
+}

home/nixvim/plugins/lsp.nix

@@ -22,6 +22,14 @@
         };
         rnix.enable = true;
       };
+
+      keymaps = [
+        {
+          key = "<leader>e";
+          action = "<cmd>lua vim.diagnostic.open_float()<CR>";
+          options.desc = "Open Diagnostics";
+        }
+      ];
     };
 
     plugins.lspconfig.enable = true;

home/nixvim/plugins/telescope/keymaps.nix

@@ -15,5 +15,10 @@
       action = "<cmd>Telescope grep_string<CR>";
       options.desc = "[S]earch current [W]ord";
     }
+    {
+      key = "<leader>q";
+      action = "<cmd>Telescope diagnostics<CR>";
+      options.desc = "Lsp Diagnostics";
+    }
   ];
 }