From d0e8de0951f7728024b1ecbb7582ddf081db2ca7 Mon Sep 17 00:00:00 2001
From: sjcobb <sjc@incyan.com>
Date: Fri, 11 Jul 2025 14:01:35 +0100
Subject: [PATCH 01/11] convert ruby module

---
 modules/plugins/languages/ruby.nix | 83 ++++++++++++++----------------
 1 file changed, 39 insertions(+), 44 deletions(-)

diff --git a/modules/plugins/languages/ruby.nix b/modules/plugins/languages/ruby.nix
index 1f3ce82f..46892df6 100644
--- a/modules/plugins/languages/ruby.nix
+++ b/modules/plugins/languages/ruby.nix
@@ -9,44 +9,41 @@
   inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.nvim.types) mkGrammarOption diagnostics;
-  inherit (lib.nvim.lua) expToLua;
-  inherit (lib.lists) isList;
-  inherit (lib.types) either listOf package str enum;
+  inherit (lib.types) listOf package enum;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.ruby;
 
-  defaultServer = "rubyserver";
+  defaultServers = ["solargraph"];
   servers = {
-    rubyserver = {
-      package = pkgs.rubyPackages.solargraph;
-      lspConfig = ''
-        lspconfig.solargraph.setup {
-          capabilities = capabilities,
-          on_attach = attach_keymaps,
-          flags = {
-            debounce_text_changes = 150,
-          },
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{ "${cfg.lsp.package}/bin/solargraph", "stdio" }''
-        }
-        }
-      '';
+    ruby_lsp = {
+      enable = true;
+      cmd = [(getExe pkgs.ruby-lsp)];
+      filetypes = ["ruby" "eruby"];
+      root_markers = ["Gemfile" ".git"];
+      init_options = {
+        formatter = "auto";
+      };
     };
-    rubylsp = {
-      package = pkgs.ruby-lsp;
-      lspConfig = ''
-        lspconfig.ruby_lsp.setup {
-          capabilities = capabilities,
-          on_attach = default_on_attach,
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{ "${cfg.lsp.package}/bin/ruby-lsp" }''
-        }
-        }
-      '';
+
+    solargraph = {
+      enable = true;
+      cmd = [(getExe pkgs.rubyPackages.solargraph) "stdio"];
+      filetypes = ["ruby"];
+      root_markers = ["Gemfile" ".git"];
+      settings = {
+        solargraph = {
+          diagnostics = true;
+        };
+      };
+
+      flags = {
+        debounce_text_changes = 150;
+      };
+
+      init_options = {
+        formatting = true;
+      };
     };
   };
 
@@ -79,17 +76,11 @@ in {
     lsp = {
       enable = mkEnableOption "Ruby LSP support" // {default = config.vim.lsp.enable;};
 
-      server = mkOption {
-        type = enum (attrNames servers);
-        default = defaultServer;
+      servers = mkOption {
+        type = listOf (enum (attrNames servers));        default = defaultServers;
+        default = defaultServers;
         description = "Ruby LSP server to use";
       };
-
-      package = mkOption {
-        type = either package (listOf str);
-        default = servers.${cfg.lsp.server}.package;
-        description = "Ruby LSP server package, or the command to run as a list of strings";
-      };
     };
 
     format = {
@@ -128,8 +119,12 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.lspconfig.enable = true;
-      vim.lsp.lspconfig.sources.ruby-lsp = servers.${cfg.lsp.server}.lspConfig;
+      vim.lsp.servers =
+        mapListToAttrs (n: {
+          name = n;
+          value = servers.${n};
+        })
+        cfg.lsp.servers;
     })
 
     (mkIf cfg.format.enable {

From 7e4a58b6f8079bcb63c2b6cb5760ab34be523744 Mon Sep 17 00:00:00 2001
From: sjcobb <sjc@incyan.com>
Date: Fri, 11 Jul 2025 14:03:51 +0100
Subject: [PATCH 02/11] convert sql module

---
 modules/plugins/languages/sql.nix | 55 +++++++++++++------------------
 1 file changed, 23 insertions(+), 32 deletions(-)

diff --git a/modules/plugins/languages/sql.nix b/modules/plugins/languages/sql.nix
index add46c15..bbe7ffc2 100644
--- a/modules/plugins/languages/sql.nix
+++ b/modules/plugins/languages/sql.nix
@@ -8,31 +8,27 @@
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.lists) isList;
-  inherit (lib.types) enum either listOf package str;
-  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.types) enum listOf package str;
   inherit (lib.nvim.types) diagnostics;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.generators) mkLuaInline;
 
   cfg = config.vim.languages.sql;
   sqlfluffDefault = pkgs.sqlfluff;
 
-  defaultServer = "sqls";
+  defaultServers = ["sqls"];
   servers = {
     sqls = {
-      package = pkgs.sqls;
-      lspConfig = ''
-        lspconfig.sqls.setup {
-          on_attach = function(client)
-            client.server_capabilities.execute_command = true
-            on_attach_keymaps(client, bufnr)
-            require'sqls'.setup{}
-          end,
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{ "${cfg.lsp.package}/bin/sqls", "-config", string.format("%s/config.yml", vim.fn.getcwd()) }''
-        }
-        }
+      enable = true;
+      cmd = [(getExe pkgs.sqls)];
+      filetypes = ["sql" "mysql"];
+      root_markers = ["config.yml"];
+      settings = {};
+      on_attach = mkLuaInline ''
+        function(client, bufnr)
+          client.server_capabilities.execute_command = true
+          require'sqls'.setup{}
+        end
       '';
     };
   };
@@ -81,17 +77,10 @@ in {
     lsp = {
       enable = mkEnableOption "SQL LSP support" // {default = config.vim.lsp.enable;};
 
-      server = mkOption {
+      servers = mkOption {
         description = "SQL LSP server to use";
-        type = enum (attrNames servers);
-        default = defaultServer;
-      };
-
-      package = mkOption {
-        description = "SQL LSP server package, or the command to run as a list of strings";
-        example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
-        type = either package (listOf str);
-        default = servers.${cfg.lsp.server}.package;
+        type = listOf (enum (attrNames servers));
+        default = defaultServers;
       };
     };
 
@@ -132,10 +121,12 @@ in {
       vim = {
         startPlugins = ["sqls-nvim"];
 
-        lsp.lspconfig = {
-          enable = true;
-          sources.sql-lsp = servers.${cfg.lsp.server}.lspConfig;
-        };
+        lsp.servers =
+          mapListToAttrs (n: {
+            name = n;
+            value = servers.${n};
+          })
+          cfg.lsp.servers;
       };
     })
 

From 632e60736f47f26ff19de5f2e64b6ea4fe1a32d7 Mon Sep 17 00:00:00 2001
From: sjcobb <sjc@incyan.com>
Date: Fri, 11 Jul 2025 14:05:16 +0100
Subject: [PATCH 03/11] convert svelte module

---
 modules/plugins/languages/svelte.nix | 62 ++++++++++++++++------------
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git a/modules/plugins/languages/svelte.nix b/modules/plugins/languages/svelte.nix
index 4cc9ffe9..dd0bbc21 100644
--- a/modules/plugins/languages/svelte.nix
+++ b/modules/plugins/languages/svelte.nix
@@ -7,28 +7,39 @@
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.lists) isList;
   inherit (lib.meta) getExe;
-  inherit (lib.types) enum either listOf package str;
-  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.types) enum listOf package;
   inherit (lib.nvim.types) mkGrammarOption diagnostics;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.generators) mkLuaInline;
 
   cfg = config.vim.languages.svelte;
 
-  defaultServer = "svelte";
+  defaultServers = ["svelte"];
   servers = {
     svelte = {
-      package = pkgs.svelte-language-server;
-      lspConfig = ''
-        lspconfig.svelte.setup {
-          capabilities = capabilities;
-          on_attach = attach_keymaps,
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/svelteserver", "--stdio"}''
-        }
-        }
+      enable = true;
+      cmd = [(getExe pkgs.svelte-language-server) "--stdio"];
+      filetypes = ["svelte"];
+      root_dir = mkLuaInline ''
+        function(bufnr, on_dir)
+          local root_files = { 'package.json', '.git' }
+          local fname = vim.api.nvim_buf_get_name(bufnr)
+          -- Svelte LSP only supports file:// schema. https://github.com/sveltejs/language-tools/issues/2777
+          if vim.uv.fs_stat(fname) ~= nil then
+            on_dir(vim.fs.dirname(vim.fs.find(root_files, { path = fname, upward = true })[1]))
+          end
+        end
+      '';
+      on_attach = mkLuaInline ''
+        function(client, bufnr)
+          vim.api.nvim_buf_create_user_command(bufnr, 'LspMigrateToSvelte5', function()
+            client:exec_cmd({
+              command = 'migrate_to_svelte_5',
+              arguments = { vim.uri_from_bufnr(bufnr) },
+            })
+          end, { desc = 'Migrate Component to Svelte 5 Syntax' })
+        end
       '';
     };
   };
@@ -78,17 +89,10 @@ in {
     lsp = {
       enable = mkEnableOption "Svelte LSP support" // {default = config.vim.lsp.enable;};
 
-      server = mkOption {
+      servers = mkOption {
         description = "Svelte LSP server to use";
-        type = enum (attrNames servers);
-        default = defaultServer;
-      };
-
-      package = mkOption {
-        description = "Svelte LSP server package, or the command to run as a list of strings";
-        example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
-        type = either package (listOf str);
-        default = servers.${cfg.lsp.server}.package;
+        type = listOf (enum (attrNames servers));
+        default = defaultServers;
       };
     };
 
@@ -126,8 +130,12 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.lspconfig.enable = true;
-      vim.lsp.lspconfig.sources.svelte-lsp = servers.${cfg.lsp.server}.lspConfig;
+      vim.lsp.servers =
+        mapListToAttrs (n: {
+          name = n;
+          value = servers.${n};
+        })
+        cfg.lsp.servers;
     })
 
     (mkIf cfg.format.enable {

From 3937b2af6438516ce72c3bd1c0859ab8f8720447 Mon Sep 17 00:00:00 2001
From: sjcobb <sjc@incyan.com>
Date: Fri, 11 Jul 2025 14:07:12 +0100
Subject: [PATCH 04/11] convert tailwind module

---
 modules/plugins/languages/tailwind.nix | 169 +++++++++++++++++++++----
 1 file changed, 141 insertions(+), 28 deletions(-)

diff --git a/modules/plugins/languages/tailwind.nix b/modules/plugins/languages/tailwind.nix
index fbe707ba..be895387 100644
--- a/modules/plugins/languages/tailwind.nix
+++ b/modules/plugins/languages/tailwind.nix
@@ -7,26 +7,142 @@
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.lists) isList;
-  inherit (lib.types) enum either listOf package str;
-  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.meta) getExe;
+  inherit (lib.types) enum listOf;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.generators) mkLuaInline;
 
   cfg = config.vim.languages.tailwind;
 
-  defaultServer = "tailwindcss-language-server";
+  defaultServers = ["tailwindcss"];
   servers = {
-    tailwindcss-language-server = {
-      package = pkgs.tailwindcss-language-server;
-      lspConfig = ''
-        lspconfig.tailwindcss.setup {
-          capabilities = capabilities;
-          on_attach = default_on_attach;
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/tailwindcss-language-server", "--stdio"}''
-        }
-        }
+    tailwindcss = {
+      enable = true;
+      cmd = [(getExe pkgs.tailwindcss-language-server) "--stdio"];
+      filetypes = [
+        # html
+        "aspnetcorerazor"
+        "astro"
+        "astro-markdown"
+        "blade"
+        "clojure"
+        "django-html"
+        "htmldjango"
+        "edge"
+        "eelixir"
+        "elixir"
+        "ejs"
+        "erb"
+        "eruby"
+        "gohtml"
+        "gohtmltmpl"
+        "haml"
+        "handlebars"
+        "hbs"
+        "html"
+        "htmlangular"
+        "html-eex"
+        "heex"
+        "jade"
+        "leaf"
+        "liquid"
+        "markdown"
+        "mdx"
+        "mustache"
+        "njk"
+        "nunjucks"
+        "php"
+        "razor"
+        "slim"
+        "twig"
+        # css
+        "css"
+        "less"
+        "postcss"
+        "sass"
+        "scss"
+        "stylus"
+        "sugarss"
+        # js
+        "javascript"
+        "javascriptreact"
+        "reason"
+        "rescript"
+        "typescript"
+        "typescriptreact"
+        # mixed
+        "vue"
+        "svelte"
+        "templ"
+      ];
+      settings = {
+        tailwindCSS = {
+          validate = true;
+          lint = {
+            cssConflict = "warning";
+            invalidApply = "error";
+            invalidScreen = "error";
+            invalidVariant = "error";
+            invalidConfigPath = "error";
+            invalidTailwindDirective = "error";
+            recommendedVariantOrder = "warning";
+          };
+          classAttributes = [
+            "class"
+            "className"
+            "class:list"
+            "classList"
+            "ngClass"
+          ];
+          includeLanguages = {
+            eelixir = "html-eex";
+            elixir = "phoenix-heex";
+            eruby = "erb";
+            heex = "phoenix-heex";
+            htmlangular = "html";
+            templ = "html";
+          };
+        };
+      };
+      before_init = mkLuaInline ''
+        function(_, config)
+          if not config.settings then
+            config.settings = {}
+          end
+          if not config.settings.editor then
+            config.settings.editor = {}
+          end
+          if not config.settings.editor.tabSize then
+            config.settings.editor.tabSize = vim.lsp.util.get_effective_tabstop()
+          end
+        end
+      '';
+      workspace_required = true;
+      root_dir = mkLuaInline ''
+        function(bufnr, on_dir)
+          local util = require 'lspconfig.util'
+          local root_files = {
+            -- Generic
+            'tailwind.config.js',
+            'tailwind.config.cjs',
+            'tailwind.config.mjs',
+            'tailwind.config.ts',
+            'postcss.config.js',
+            'postcss.config.cjs',
+            'postcss.config.mjs',
+            'postcss.config.ts',
+            -- Django
+            'theme/static_src/tailwind.config.js',
+            'theme/static_src/tailwind.config.cjs',
+            'theme/static_src/tailwind.config.mjs',
+            'theme/static_src/tailwind.config.ts',
+            'theme/static_src/postcss.config.js',
+          }
+          local fname = vim.api.nvim_buf_get_name(bufnr)
+          root_files = util.insert_package_json(root_files, 'tailwindcss', fname)
+          root_files = util.root_markers_with_field(root_files, { 'mix.lock', 'Gemfile.lock' }, 'tailwind', fname)
+          on_dir(vim.fs.dirname(vim.fs.find(root_files, { path = fname, upward = true })[1]))
+        end
       '';
     };
   };
@@ -37,25 +153,22 @@ in {
     lsp = {
       enable = mkEnableOption "Tailwindcss LSP support" // {default = config.vim.lsp.enable;};
 
-      server = mkOption {
+      servers = mkOption {
         description = "Tailwindcss LSP server to use";
-        type = enum (attrNames servers);
-        default = defaultServer;
-      };
-
-      package = mkOption {
-        description = "Tailwindcss LSP server package, or the command to run as a list of strings";
-        example = ''[lib.getExe pkgs.jdt-language-server " - data " " ~/.cache/jdtls/workspace "]'';
-        type = either package (listOf str);
-        default = servers.${cfg.lsp.server}.package;
+        type = listOf (enum (attrNames servers));
+        default = defaultServers;
       };
     };
   };
 
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.lsp.enable {
-      vim.lsp.lspconfig.enable = true;
-      vim.lsp.lspconfig.sources.tailwindcss-lsp = servers.${cfg.lsp.server}.lspConfig;
+      vim.lsp.servers =
+        mapListToAttrs (n: {
+          name = n;
+          value = servers.${n};
+        })
+        cfg.lsp.servers;
     })
   ]);
 }

From 76af21eb41dd0ae5c5d8af31cf6af42eeca1f7e8 Mon Sep 17 00:00:00 2001
From: sjcobb <sjc@incyan.com>
Date: Fri, 11 Jul 2025 14:08:31 +0100
Subject: [PATCH 05/11] convert terraform module

---
 modules/plugins/languages/terraform.nix | 37 ++++++++++++++++---------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/modules/plugins/languages/terraform.nix b/modules/plugins/languages/terraform.nix
index 095da072..4e13ecf0 100644
--- a/modules/plugins/languages/terraform.nix
+++ b/modules/plugins/languages/terraform.nix
@@ -4,12 +4,25 @@
   lib,
   ...
 }: let
+  inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) package;
+  inherit (lib.meta) getExe;
+  inherit (lib.types) enum listOf;
   inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.terraform;
+
+  defaultServers = ["terraformls"];
+  servers = {
+    terraformls = {
+      enable = true;
+      cmd = [(getExe pkgs.terraform-ls) "serve"];
+      filetypes = ["terraform" "terraform-vars"];
+      root_markers = [".terraform" ".git"];
+    };
+  };
 in {
   options.vim.languages.terraform = {
     enable = mkEnableOption "Terraform/HCL support";
@@ -22,10 +35,10 @@ in {
     lsp = {
       enable = mkEnableOption "Terraform LSP support (terraform-ls)" // {default = config.vim.lsp.enable;};
 
-      package = mkOption {
-        description = "terraform-ls package";
-        type = package;
-        default = pkgs.terraform-ls;
+      servers = mkOption {
+        description = "Terraform LSP server to use";
+        type = listOf (enum (attrNames servers));
+        default = defaultServers;
       };
     };
   };
@@ -36,14 +49,12 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.lspconfig.enable = true;
-      vim.lsp.lspconfig.sources.terraform-ls = ''
-        lspconfig.terraformls.setup {
-          capabilities = capabilities,
-          on_attach=default_on_attach,
-          cmd = {"${cfg.lsp.package}/bin/terraform-ls", "serve"},
-        }
-      '';
+      vim.lsp.servers =
+        mapListToAttrs (n: {
+          name = n;
+          value = servers.${n};
+        })
+        cfg.lsp.servers;
     })
   ]);
 }

From eb60648df2a15918102fba151b2947e277091c0d Mon Sep 17 00:00:00 2001
From: sjcobb <sjc@incyan.com>
Date: Fri, 11 Jul 2025 14:11:00 +0100
Subject: [PATCH 06/11] remove accidental silly duplication

---
 modules/plugins/languages/ruby.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugins/languages/ruby.nix b/modules/plugins/languages/ruby.nix
index 46892df6..6b2e63da 100644
--- a/modules/plugins/languages/ruby.nix
+++ b/modules/plugins/languages/ruby.nix
@@ -77,7 +77,7 @@ in {
       enable = mkEnableOption "Ruby LSP support" // {default = config.vim.lsp.enable;};
 
       servers = mkOption {
-        type = listOf (enum (attrNames servers));        default = defaultServers;
+        type = listOf (enum (attrNames servers));
         default = defaultServers;
         description = "Ruby LSP server to use";
       };

From 510fae6730a73816b631ee10ff82515719ad838d Mon Sep 17 00:00:00 2001
From: sjcobb <sjc@incyan.com>
Date: Fri, 11 Jul 2025 14:11:40 +0100
Subject: [PATCH 07/11] convert typst module

---
 modules/plugins/languages/typst.nix | 126 +++++++++++++++++-----------
 1 file changed, 79 insertions(+), 47 deletions(-)

diff --git a/modules/plugins/languages/typst.nix b/modules/plugins/languages/typst.nix
index 08a2252b..720b3f7a 100644
--- a/modules/plugins/languages/typst.nix
+++ b/modules/plugins/languages/typst.nix
@@ -6,52 +6,87 @@
 }: let
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.lists) isList;
-  inherit (lib.types) nullOr enum either attrsOf listOf package str;
+  inherit (lib.types) nullOr enum attrsOf listOf package str;
   inherit (lib.attrsets) attrNames;
   inherit (lib.meta) getExe;
-  inherit (lib.nvim.lua) expToLua toLuaObject;
   inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption;
   inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.lua) toLuaObject;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.generators) mkLuaInline;
 
   cfg = config.vim.languages.typst;
 
-  defaultServer = "tinymist";
+  defaultServers = ["tinymist"];
   servers = {
-    typst-lsp = {
-      package = pkgs.typst-lsp;
-      lspConfig = ''
-        lspconfig.typst_lsp.setup {
-          capabilities = capabilities,
-          on_attach = function(client, bufnr)
-            -- Disable semantic tokens as a workaround for a semantic token error when using non-english characters
-            client.server_capabilities.semanticTokensProvider = nil
-          end,
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/typst-lsp"}''
-        },
-        }
+    typst_lsp = {
+      enable = true;
+      cmd = [(getExe pkgs.typst-lsp)];
+      filetypes = ["typst"];
+      root_markers = [".git"];
+      on_attach = mkLuaInline ''
+        function(client, bufnr)
+          -- Disable semantic tokens as a workaround for a semantic token error when using non-english characters
+          client.server_capabilities.semanticTokensProvider = nil
+        end
       '';
     };
 
     tinymist = {
-      package = pkgs.tinymist;
-      lspConfig = ''
-        lspconfig.tinymist.setup {
-          capabilities = capabilities,
-          single_file_support = true,
-          on_attach = function(client, bufnr)
-            -- Disable semantic tokens as a workaround for a semantic token error when using non-english characters
-            client.server_capabilities.semanticTokensProvider = nil
-          end,
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/tinymist"}''
-        },
-        }
+      enable = true;
+      cmd = [(getExe pkgs.tinymist)];
+      filetypes = ["typst"];
+      root_markers = [".git"];
+      on_attach = mkLuaInline ''
+        function(client, bufnr)
+          local function create_tinymist_command(command_name, client, bufnr)
+            local export_type = command_name:match 'tinymist%.export(%w+)'
+            local info_type = command_name:match 'tinymist%.(%w+)'
+            if info_type and info_type:match '^get' then
+              info_type = info_type:gsub('^get', 'Get')
+            end
+            local cmd_display = export_type or info_type
+            local function run_tinymist_command()
+              local arguments = { vim.api.nvim_buf_get_name(bufnr) }
+              local title_str = export_type and ('Export ' .. cmd_display) or cmd_display
+              local function handler(err, res)
+                if err then
+                  return vim.notify(err.code .. ': ' .. err.message, vim.log.levels.ERROR)
+                end
+                vim.notify(export_type and res or vim.inspect(res), vim.log.levels.INFO)
+              end
+              if vim.fn.has 'nvim-0.11' == 1 then
+                return client:exec_cmd({
+                  title = title_str,
+                  command = command_name,
+                  arguments = arguments,
+                }, { bufnr = bufnr }, handler)
+              else
+                return vim.notify('Tinymist commands require Neovim 0.11+', vim.log.levels.WARN)
+              end
+            end
+            local cmd_name = export_type and ('LspTinymistExport' .. cmd_display) or ('LspTinymist' .. cmd_display)
+            local cmd_desc = export_type and ('Export to ' .. cmd_display) or ('Get ' .. cmd_display)
+            return run_tinymist_command, cmd_name, cmd_desc
+          end
+
+          for _, command in ipairs {
+            'tinymist.exportSvg',
+            'tinymist.exportPng',
+            'tinymist.exportPdf',
+            'tinymist.exportMarkdown',
+            'tinymist.exportText',
+            'tinymist.exportQuery',
+            'tinymist.exportAnsiHighlight',
+            'tinymist.getServerInfo',
+            'tinymist.getDocumentTrace',
+            'tinymist.getWorkspaceLabels',
+            'tinymist.getDocumentMetrics',
+          } do
+            local cmd_func, cmd_name, cmd_desc = create_tinymist_command(command, client, bufnr)
+            vim.api.nvim_buf_create_user_command(bufnr, cmd_name, cmd_func, { nargs = 0, desc = cmd_desc })
+          end
+        end
       '';
     };
   };
@@ -78,17 +113,10 @@ in {
     lsp = {
       enable = mkEnableOption "Typst LSP support (typst-lsp)" // {default = config.vim.lsp.enable;};
 
-      server = mkOption {
+      servers = mkOption {
         description = "Typst LSP server to use";
-        type = enum (attrNames servers);
-        default = defaultServer;
-      };
-
-      package = mkOption {
-        description = "typst-lsp package, or the command to run as a list of strings";
-        example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
-        type = either package (listOf str);
-        default = servers.${cfg.lsp.server}.package;
+        type = listOf (enum (attrNames servers));
+        default = defaultServers;
       };
     };
 
@@ -131,7 +159,7 @@ in {
           dependencies_bin = mkOption {
             type = attrsOf str;
             default = {
-              "tinymist" = getExe servers.tinymist.package;
+              "tinymist" = getExe pkgs.tinymist;
               "websocat" = getExe pkgs.websocat;
             };
 
@@ -169,8 +197,12 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.lspconfig.enable = true;
-      vim.lsp.lspconfig.sources.typst-lsp = servers.${cfg.lsp.server}.lspConfig;
+      vim.lsp.servers =
+        mapListToAttrs (n: {
+          name = n;
+          value = servers.${n};
+        })
+        cfg.lsp.servers;
     })
 
     # Extensions

From ea2094b89d0004224e13e739e214b4e7a356ebdf Mon Sep 17 00:00:00 2001
From: sjcobb <sjc@incyan.com>
Date: Fri, 11 Jul 2025 14:14:03 +0100
Subject: [PATCH 08/11] convert vala module

---
 modules/plugins/languages/vala.nix | 73 ++++++++++++++++++------------
 1 file changed, 45 insertions(+), 28 deletions(-)

diff --git a/modules/plugins/languages/vala.nix b/modules/plugins/languages/vala.nix
index 220926d0..2c4f09d1 100644
--- a/modules/plugins/languages/vala.nix
+++ b/modules/plugins/languages/vala.nix
@@ -7,17 +7,19 @@
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.lists) isList;
-  inherit (lib.types) enum either listOf package str;
+  inherit (lib.meta) getExe;
+  inherit (lib.types) enum listOf;
   inherit (lib.nvim.types) mkGrammarOption;
-  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.generators) mkLuaInline;
 
   cfg = config.vim.languages.vala;
 
-  defaultServer = "vala_ls";
+  defaultServers = ["vala_ls"];
   servers = {
     vala_ls = {
-      package = pkgs.symlinkJoin {
+      enable = true;
+      cmd = [(getExe (pkgs.symlinkJoin {
         name = "vala-language-server-wrapper";
         paths = [pkgs.vala-language-server];
         buildInputs = [pkgs.makeBinaryWrapper];
@@ -25,18 +27,35 @@
           wrapProgram $out/bin/vala-language-server \
             --prefix PATH : ${pkgs.uncrustify}/bin
         '';
-      };
-      internalFormatter = true;
-      lspConfig = ''
-        lspconfig.vala_ls.setup {
-          capabilities = capabilities;
-          on_attach = default_on_attach;
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/vala-language-server"}''
-        },
-        }
+      }))];
+      filetypes = ["vala" "genie"];
+      root_dir = mkLuaInline ''
+        function(bufnr, on_dir)
+          local meson_matcher = function(path)
+            local pattern = 'meson.build'
+            local f = vim.fn.glob(table.concat({ path, pattern }, '/'))
+            if f == ''' then
+              return nil
+            end
+            for line in io.lines(f) do
+              -- skip meson comments
+              if not line:match '^%s*#.*' then
+                local str = line:gsub('%s+', ''')
+                if str ~= ''' then
+                  if str:match '^project%(' then
+                    return path
+                  else
+                    break
+                  end
+                end
+              end
+            end
+          end
+
+          local fname = vim.api.nvim_buf_get_name(bufnr)
+          local root = vim.iter(vim.fs.parents(fname)):find(meson_matcher)
+          on_dir(root or vim.fs.dirname(vim.fs.find('.git', { path = fname, upward = true })[1]))
+        end
       '';
     };
   };
@@ -51,16 +70,10 @@ in {
 
     lsp = {
       enable = mkEnableOption "Vala LSP support" // {default = config.vim.lsp.enable;};
-      server = mkOption {
+      servers = mkOption {
         description = "Vala LSP server to use";
-        type = enum (attrNames servers);
-        default = defaultServer;
-      };
-
-      package = mkOption {
-        description = "Vala LSP server package, or the command to run as a list of strings";
-        type = either package (listOf str);
-        default = servers.${cfg.lsp.server}.package;
+        type = listOf (enum (attrNames servers));
+        default = defaultServers;
       };
     };
   };
@@ -72,8 +85,12 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.lspconfig.enable = true;
-      vim.lsp.lspconfig.sources.vala_ls = servers.${cfg.lsp.server}.lspConfig;
+      vim.lsp.servers =
+        mapListToAttrs (n: {
+          name = n;
+          value = servers.${n};
+        })
+        cfg.lsp.servers;
     })
   ]);
 }

From 51365741b038173eeff088f05dc5425af8dde573 Mon Sep 17 00:00:00 2001
From: sjcobb <sjc@incyan.com>
Date: Fri, 11 Jul 2025 14:15:40 +0100
Subject: [PATCH 09/11] fmt

---
 modules/plugins/languages/vala.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/modules/plugins/languages/vala.nix b/modules/plugins/languages/vala.nix
index 2c4f09d1..5bc91def 100644
--- a/modules/plugins/languages/vala.nix
+++ b/modules/plugins/languages/vala.nix
@@ -19,15 +19,17 @@
   servers = {
     vala_ls = {
       enable = true;
-      cmd = [(getExe (pkgs.symlinkJoin {
-        name = "vala-language-server-wrapper";
-        paths = [pkgs.vala-language-server];
-        buildInputs = [pkgs.makeBinaryWrapper];
-        postBuild = ''
-          wrapProgram $out/bin/vala-language-server \
-            --prefix PATH : ${pkgs.uncrustify}/bin
-        '';
-      }))];
+      cmd = [
+        (getExe (pkgs.symlinkJoin {
+          name = "vala-language-server-wrapper";
+          paths = [pkgs.vala-language-server];
+          buildInputs = [pkgs.makeBinaryWrapper];
+          postBuild = ''
+            wrapProgram $out/bin/vala-language-server \
+              --prefix PATH : ${pkgs.uncrustify}/bin
+          '';
+        }))
+      ];
       filetypes = ["vala" "genie"];
       root_dir = mkLuaInline ''
         function(bufnr, on_dir)

From d2f41e2918878ff67db538af1218c8ce683ed45f Mon Sep 17 00:00:00 2001
From: sjcobb <sjc@incyan.com>
Date: Fri, 11 Jul 2025 14:15:51 +0100
Subject: [PATCH 10/11] convert wgsl module

---
 modules/plugins/languages/wgsl.nix | 55 +++++++++++-------------------
 1 file changed, 20 insertions(+), 35 deletions(-)

diff --git a/modules/plugins/languages/wgsl.nix b/modules/plugins/languages/wgsl.nix
index f374543e..3b278a27 100644
--- a/modules/plugins/languages/wgsl.nix
+++ b/modules/plugins/languages/wgsl.nix
@@ -5,31 +5,23 @@
   ...
 }: let
   inherit (builtins) attrNames;
-  inherit (lib.lists) isList;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.nvim.lua) expToLua;
   inherit (lib.nvim.types) mkGrammarOption;
-  inherit (lib.options) literalExpression mkEnableOption mkOption;
-  inherit (lib.types) either enum listOf package str;
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.types) enum listOf;
+  inherit (lib.meta) getExe;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.wgsl;
 
-  defaultServer = "wgsl-analyzer";
+  defaultServers = ["wgsl_analyzer"];
   servers = {
-    wgsl-analyzer = {
-      package = pkgs.wgsl-analyzer;
-      internalFormatter = true;
-      lspConfig = ''
-        lspconfig.wgsl_analyzer.setup {
-          capabilities = capabilities,
-          on_attach = default_on_attach,
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else "{'${cfg.lsp.package}/bin/wgsl_analyzer'}"
-        }
-        }
-      '';
+    wgsl_analyzer = {
+      enable = true;
+      cmd = [(getExe pkgs.wgsl-analyzer)];
+      filetypes = ["wgsl"];
+      root_markers = [".git"];
+      settings = {};
     };
   };
 in {
@@ -44,18 +36,11 @@ in {
     lsp = {
       enable = mkEnableOption "WGSL LSP support" // {default = config.vim.lsp.enable;};
 
-      server = mkOption {
-        type = enum (attrNames servers);
-        default = defaultServer;
+      servers = mkOption {
+        type = listOf (enum (attrNames servers));
+        default = defaultServers;
         description = "WGSL LSP server to use";
       };
-
-      package = mkOption {
-        description = "wgsl-analyzer package, or the command to run as a list of strings";
-        example = literalExpression "[(lib.getExe pkgs.wgsl-analyzer)]";
-        type = either package (listOf str);
-        default = pkgs.wgsl-analyzer;
-      };
     };
   };
 
@@ -68,12 +53,12 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim = {
-        lsp.lspconfig = {
-          enable = true;
-          sources.wgsl_analyzer = servers.${cfg.lsp.server}.lspConfig;
-        };
-      };
+      vim.lsp.servers =
+        mapListToAttrs (n: {
+          name = n;
+          value = servers.${n};
+        })
+        cfg.lsp.servers;
     })
   ]);
 }

From 6292ff438c067dfc140b78d3e89b66a65271a449 Mon Sep 17 00:00:00 2001
From: sjcobb <sjc@incyan.com>
Date: Fri, 11 Jul 2025 14:17:23 +0100
Subject: [PATCH 11/11] convert zig module

---
 modules/plugins/languages/zig.nix | 48 ++++++++++++-------------------
 1 file changed, 18 insertions(+), 30 deletions(-)

diff --git a/modules/plugins/languages/zig.nix b/modules/plugins/languages/zig.nix
index 89307eab..db38cc51 100644
--- a/modules/plugins/languages/zig.nix
+++ b/modules/plugins/languages/zig.nix
@@ -7,29 +7,21 @@
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge mkDefault;
-  inherit (lib.lists) isList;
-  inherit (lib.types) bool either listOf package str enum;
-  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.types) bool listOf package enum;
   inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.meta) getExe;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.zig;
 
-  defaultServer = "zls";
+  defaultServers = ["zls"];
   servers = {
     zls = {
-      package = pkgs.zls;
-      internalFormatter = true;
-      lspConfig = ''
-        lspconfig.zls.setup {
-          capabilities = capabilities,
-          on_attach = default_on_attach,
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else "{'${cfg.lsp.package}/bin/zls'}"
-        }
-        }
-      '';
+      enable = true;
+      cmd = [(getExe pkgs.zls)];
+      filetypes = ["zig" "zir"];
+      root_markers = ["zls.json" "build.zig" ".git"];
+      workspace_required = false;
     };
   };
 
@@ -74,17 +66,11 @@ in {
     lsp = {
       enable = mkEnableOption "Zig LSP support" // {default = config.vim.lsp.enable;};
 
-      server = mkOption {
-        type = enum (attrNames servers);
-        default = defaultServer;
+      servers = mkOption {
+        type = listOf (enum (attrNames servers));
+        default = defaultServers;
         description = "Zig LSP server to use";
       };
-
-      package = mkOption {
-        description = "ZLS package, or the command to run as a list of strings";
-        type = either package (listOf str);
-        default = pkgs.zls;
-      };
     };
 
     dap = {
@@ -118,10 +104,12 @@ in {
 
     (mkIf cfg.lsp.enable {
       vim = {
-        lsp.lspconfig = {
-          enable = true;
-          sources.zig-lsp = servers.${cfg.lsp.server}.lspConfig;
-        };
+        lsp.servers =
+          mapListToAttrs (n: {
+            name = n;
+            value = servers.${n};
+          })
+          cfg.lsp.servers;
 
         # nvf handles autosaving already
         globals.zig_fmt_autosave = mkDefault 0;