feat(nvim): make TypeScript language server configurable

flake.lock

@@ -552,7 +552,6 @@
         ],
         "plugins-atlas-nvim": "plugins-atlas-nvim",
         "plugins-beancount-nvim": "plugins-beancount-nvim",
-        "plugins-nvimkit-nvim": "plugins-nvimkit-nvim",
         "plugins-shipwright-nvim": "plugins-shipwright-nvim",
         "plugins-tailwind-fold-nvim": "plugins-tailwind-fold-nvim"
       },
@@ -598,22 +597,6 @@
         "type": "github"
       }
     },
-    "plugins-nvimkit-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1721393835,
-        "narHash": "sha256-MdmrhLHMxrn6upu1chjKyitPZ5WkCQtpI465AKJXDOA=",
-        "owner": "jamesblckwell",
-        "repo": "nvimkit.nvim",
-        "rev": "af363d22699760f66988e8d36539a5753039217a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jamesblckwell",
-        "repo": "nvimkit.nvim",
-        "type": "github"
-      }
-    },
     "plugins-shipwright-nvim": {
       "flake": false,
       "locked": {

home/modules/nvim/config/after/plugin/lspconfig.lua

@@ -96,43 +96,42 @@ local servers = {
   },
   tailwindcss = {},
   ts_ls = {},
-  -- vtsls = {
-  --   maxTsServerMemory = 16384,
-  --   filetypes = {
-  --     "javascript",
-  --     "javascriptreact",
-  --     "javascript.jsx",
-  --     "typescript",
-  --     "typescriptreact",
-  --     "typescript.tsx",
-  --   },
-  --   settings = {
-  --     complete_function_calls = true,
-  --     vtsls = {
-  --       enableMoveToFileCodeAction = true,
-  --       autoUseWorkspaceTsdk = true,
-  --       experimental = {
-  --         completion = {
-  --           enableServerSideFuzzyMatch = true,
-  --         },
-  --       },
-  --     },
-  --     typescript = {
-  --       updateImportsOnFileMove = { enabled = "always" },
-  --       suggest = {
-  --         completeFunctionCalls = true,
-  --       },
-  --       inlayHints = {
-  --         enumMemberValues = { enabled = true },
-  --         functionLikeReturnTypes = { enabled = true },
-  --         parameterNames = { enabled = "literals" },
-  --         parameterTypes = { enabled = true },
-  --         propertyDeclarationTypes = { enabled = true },
-  --         variableTypes = { enabled = false },
-  --       },
-  --     },
-  --   },
-  -- },
+  vtsls = {
+    filetypes = {
+      "javascript",
+      "javascriptreact",
+      "javascript.jsx",
+      "typescript",
+      "typescriptreact",
+      "typescript.tsx",
+    },
+    settings = {
+      vtsls = {
+        enableMoveToFileCodeAction = true,
+        autoUseWorkspaceTsdk = true,
+        experimental = {
+          completion = {
+            enableServerSideFuzzyMatch = true,
+          },
+        },
+      },
+      typescript = {
+        updateImportsOnFileMove = { enabled = "always" },
+        tsserver = { maxTsServerMemory = 16384 },
+        suggest = {
+          completeFunctionCalls = true,
+        },
+        inlayHints = {
+          enumMemberValues = { enabled = true },
+          functionLikeReturnTypes = { enabled = true },
+          parameterNames = { enabled = "literals" },
+          parameterTypes = { enabled = true },
+          propertyDeclarationTypes = { enabled = true },
+          variableTypes = { enabled = false },
+        },
+      },
+    },
+  },
   yamlls = {
     settings = {
       yaml = {
@@ -149,6 +148,13 @@ local servers = {
   },
 }
 
+local typescript_server = require("nixCatsUtils").getCatOrDefault("typescriptServer", "ts_ls")
+for _, server in ipairs({ "ts_ls", "vtsls" }) do
+  if server ~= typescript_server then
+    servers[server] = nil
+  end
+end
+
 for server, config in pairs(servers) do
   config.capabilities = capabilities
   vim.lsp.config(server, config)

home/modules/nvim/config/flake.lock

@@ -63,22 +63,6 @@
         "type": "github"
       }
     },
-    "plugins-nvimkit-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1721393835,
-        "narHash": "sha256-MdmrhLHMxrn6upu1chjKyitPZ5WkCQtpI465AKJXDOA=",
-        "owner": "jamesblckwell",
-        "repo": "nvimkit.nvim",
-        "rev": "af363d22699760f66988e8d36539a5753039217a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jamesblckwell",
-        "repo": "nvimkit.nvim",
-        "type": "github"
-      }
-    },
     "plugins-shipwright-nvim": {
       "flake": false,
       "locked": {
@@ -117,7 +101,6 @@
         "nixpkgs": "nixpkgs",
         "plugins-atlas-nvim": "plugins-atlas-nvim",
         "plugins-beancount-nvim": "plugins-beancount-nvim",
-        "plugins-nvimkit-nvim": "plugins-nvimkit-nvim",
         "plugins-shipwright-nvim": "plugins-shipwright-nvim",
         "plugins-tailwind-fold-nvim": "plugins-tailwind-fold-nvim"
       }

home/modules/nvim/config/flake.nix

@@ -19,10 +19,6 @@
       url = "github:razak17/tailwind-fold.nvim";
       flake = false;
     };
-    plugins-nvimkit-nvim = {
-      url = "github:jamesblckwell/nvimkit.nvim";
-      flake = false;
-    };
     plugins-atlas-nvim = {
       url = "github:emrearmagan/atlas.nvim";
       flake = false;
@@ -111,9 +107,8 @@
               stylua
               tree-sitter
               tailwindcss-language-server
-              typescript-language-server
+              (if (categories.typescriptServer or "ts_ls") == "vtsls" then vtsls else typescript-language-server)
               vscode-langservers-extracted
-              vtsls
               yaml-language-server
               yamllint
             ];
@@ -182,7 +177,6 @@
                 nvim-dbee
                 image-nvim
                 pkgs.neovimPlugins.beancount-nvim
-                pkgs.neovimPlugins.nvimkit-nvim
                 codecompanion-nvim
                 helm-ls-nvim
                 kitty-scrollback-nvim
@@ -219,6 +213,7 @@
             general = true;
             github = false;
             colorscheme = "zenwritten";
+            typescriptServer = "ts_ls";
           };
         };
       };

home/modules/nvim/default.nix

@@ -13,16 +13,26 @@ in
 {
   imports = [ inputs.nvim.homeModules.default ];
 
-  options.nvim.colorscheme = lib.mkOption {
+  options.nvim = {
+    colorscheme = lib.mkOption {
       type = lib.types.enum (lib.attrNames themes);
       default = "zenwritten";
     };
+    typescriptServer = lib.mkOption {
+      default = "ts_ls";
+      type = lib.types.enum [
+        "ts_ls"
+        "vtsls"
+      ];
+    };
+  };
 
   config = lib.mkIf config.nvim.enable {
     nvim.packageDefinitions.merge.nvim = _: {
       categories = {
         colorscheme = config.nvim.colorscheme;
         github = config.git.github.enable;
+        inherit (config.nvim) typescriptServer;
       };
     };