modules/nixvim/options.nix

@@ -77,7 +77,6 @@ in {
       icu74
       alejandra
       vscode-extensions.ms-vscode.cpptools
-      nixpkgs-fmt
     ];
     extraPlugins = with pkgs.vimPlugins; [
       {

modules/nixvim/plugins/lsp/cmp.nix

@@ -10,7 +10,7 @@
         store_selection_keys = "<Tab>";
       };
       fromLua = [
-        { paths = ../../snippets; }
+        {paths = ../../snippets;}
       ];
     };
     lspkind = {
@@ -69,14 +69,14 @@
         '';
         completion.completeopt = "menu,preview";
         sources = [
-          { name = "luasnip"; }
-          { name = "nvim_lsp"; }
-          { name = "nvim_lsp_signature_help"; }
-          { name = "nvim_lsp_document_symbol"; }
-          { name = "codeium"; }
-          { name = "path"; }
-          { name = "buffer"; }
-          { name = "treesitter"; }
+          {name = "luasnip";}
+          {name = "nvim_lsp";}
+          {name = "nvim_lsp_signature_help";}
+          {name = "nvim_lsp_document_symbol";}
+          {name = "codeium";}
+          {name = "path";}
+          {name = "buffer";}
+          {name = "treesitter";}
         ];
         mapping = {
           __raw = ''
@@ -201,14 +201,6 @@
           ];
         };
         ":" = {
-          completion.completeopt = "menu,menuone,noselect";
-          mapping = {
-            __raw = ''
-              cmp.mapping.preset.cmdline({
-                ["<CR>"] = cmp.mapping.confirm { select = true },
-              })
-            '';
-          };
           sources = [
             {
               name = "path";
@@ -220,7 +212,7 @@
         };
         "?" = {
           mapping = {
-            completion.completeopt = "menu,menuone,noselect";
+            completion.completeopt = "menuone,noselect";
             __raw = "cmp.mapping.preset.cmdline({
               ['<C-b>'] = cmp.mapping.scroll_docs(-4),
               ['<C-f>'] = cmp.mapping.scroll_docs(4),

modules/nixvim/plugins/trouble.nix

@@ -1,31 +1,9 @@
 {
-  plugins.trouble = {
-    enable = true;
-    settings = {
-      modes = {
-        workspace-diagnostics = {
-          mode = "diagnostics";
-          filter = [{
-            any = [
-              { buf = 0; }
-              {
-                __raw =
-                  ''
-                    function(item)
-                      return item.filename:find((vim.loop or vim.uv).cwd(), 1, true)
-                    end
-                  '';
-              }
-            ];
-          }];
-        };
-      };
-    };
-  };
+  plugins.trouble.enable = true;
   keymaps = [
     {
       key = "<leader>xx";
-      action = "<cmd>Trouble workspace-diagnostics toggle<CR>";
+      action = "<cmd>Trouble diagnostics toggle<CR>";
       options = {
         silent = true;
       };