lib/languages.nix

@@ -62,7 +62,7 @@ in {
       };
 
       cmd = mkOption {
-        type = nullOr (either luaInline (listOf str));
+        type = nullOr (listOf (oneOf [str luaInline]));
         default = null;
         description = "Command used to start the LSP server";
       };

modules/plugins/languages/bash.nix

@@ -13,7 +13,6 @@
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.types) diagnostics mkGrammarOption;
   inherit (lib.nvim.lua) expToLua;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.bash;
 

modules/plugins/languages/clojure.nix

@@ -4,15 +4,13 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
   inherit (lib.lists) isList;
-  inherit (lib.types) enum either listOf package str;
+  inherit (lib.types) either listOf package str;
   inherit (lib.nvim.types) mkGrammarOption;
   inherit (lib.nvim.lua) expToLua;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.clojure;
 

modules/plugins/languages/dart.nix

@@ -6,7 +6,6 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.meta) getExe;
   inherit (lib.trivial) boolToString;
   inherit (lib.lists) isList;
   inherit (lib.options) mkEnableOption mkOption;
@@ -15,31 +14,26 @@
   inherit (lib.nvim.lua) expToLua;
   inherit (lib.nvim.types) mkGrammarOption;
   inherit (lib.nvim.dag) entryAfter;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.dart;
   ftcfg = cfg.flutter-tools;
 
-  defaultServers = ["dart"];
+  defaultServer = "dart";
   servers = {
     dart = {
-      enable = true;
+      package = pkgs.dart;
-      cmd = [(getExe pkgs.dart) "language-server" "--protocol=lsp"];
+      lspConfig = ''
-      filetypes = ["dart"];
+        lspconfig.dartls.setup{
-      root_markers = ["pubspec.yaml"];
+          capabilities = capabilities;
-      init_options = {
+          on_attach=default_on_attach;
-        onlyAnalyzeProjectsWithOpenFiles = true;
+          cmd = ${
-        suggestFromUnimportedLibraries = true;
+          if isList cfg.lsp.package
-        closingLabels = true;
+          then expToLua cfg.lsp.package
-        outline = true;
+          else ''{"${cfg.lsp.package}/bin/dart", "language-server", "--protocol=lsp"}''
-        flutterOutline = true;
-      };
-      settings = {
-        dart = {
-          completeFunctionCalls = true;
-          showTodos = true;
         };
-      };
+          ${optionalString (cfg.lsp.opts != null) "init_options = ${cfg.lsp.dartOpts}"}
+        }
+      '';
     };
   };
 in {
@@ -52,11 +46,23 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Dart LSP support" // {default = config.vim.lsp.enable;};
+      enable = mkEnableOption "Dart LSP support";
-      servers = mkOption {
+      server = mkOption {
-        description = "Dart LSP server to use";
+        description = "The Dart LSP server to use";
-        type = listOf (enum (attrNames servers));
+        type = enum (attrNames servers);
-        default = defaultServers;
+        default = defaultServer;
+      };
+      package = mkOption {
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
+        example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
+        description = "Dart LSP server package, or the command to run as a list of strings";
+      };
+
+      opts = mkOption {
+        type = nullOr str;
+        default = null;
+        description = "Options to pass to Dart LSP server";
       };
     };
 
@@ -125,23 +131,19 @@ in {
     };
   };
 
-  config = mkIf cfg.enable (mkMerge [
+  config.vim = mkIf cfg.enable (mkMerge [
     (mkIf cfg.treesitter.enable {
-      vim.treesitter.enable = true;
+      treesitter.enable = true;
-      vim.treesitter.grammars = [cfg.treesitter.package];
+      treesitter.grammars = [cfg.treesitter.package];
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
+      lsp.lspconfig.enable = true;
-        mapListToAttrs (n: {
+      lsp.lspconfig.sources.dart-lsp = servers.${cfg.lsp.server}.lspConfig;
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
     })
 
     (mkIf ftcfg.enable {
-      vim.startPlugins = [
+      startPlugins = [
         (
           if ftcfg.enableNoResolvePatch
           then "flutter-tools-patched"
@@ -150,7 +152,7 @@ in {
         "plenary-nvim"
       ];
 
-      vim.pluginRC.flutter-tools = entryAfter ["lsp-servers"] ''
+      pluginRC.flutter-tools = entryAfter ["lsp-setup"] ''
         require('flutter-tools').setup {
           ${optionalString (ftcfg.flutterPackage != null) "flutter_path = \"${ftcfg.flutterPackage}/bin/flutter\","}
           lsp = {

modules/plugins/languages/elixir.nix

@@ -8,37 +8,29 @@
   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.generators) mkLuaInline;
   inherit (lib.nvim.types) mkGrammarOption;
   inherit (lib.nvim.lua) expToLua;
   inherit (lib.nvim.dag) entryAnywhere;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.elixir;
 
-  defaultServers = ["elixirls"];
+  defaultServer = "elixirls";
   servers = {
     elixirls = {
-      enable = true;
+      package = pkgs.elixir-ls;
-      cmd = [(getExe pkgs.elixir-ls)];
+      lspConfig = ''
-      filetypes = ["elixir" "eelixir" "heex" "surface"];
+        -- elixirls setup
-      root_dir =
+        lspconfig.elixirls.setup {
-        mkLuaInline
+          capabilities = capabilities,
-        /*
+          on_attach = default_on_attach,
-        lua
+          cmd = ${
-        */
+          if isList cfg.lsp.package
-        ''
+          then expToLua cfg.lsp.package
-          function(bufnr, on_dir)
+          else ''{"${cfg.lsp.package}/bin/elixir-ls"}''
-            local fname = vim.api.nvim_buf_get_name(bufnr)
+        }
-            local matches = vim.fs.find({ 'mix.exs' }, { upward = true, limit = 2, path = fname })
+        }
-            local child_or_root_path, maybe_umbrella_path = unpack(matches)
+      '';
-            local root_dir = vim.fs.dirname(maybe_umbrella_path or child_or_root_path)
-
-            on_dir(root_dir)
-          end
-        '';
     };
   };
 
@@ -62,10 +54,18 @@ in {
 
     lsp = {
       enable = mkEnableOption "Elixir LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
+
+      server = mkOption {
         description = "Elixir LSP server to use";
-        type = listOf (enum (attrNames servers));
+        type = enum (attrNames servers);
-        default = defaultServers;
+        default = defaultServer;
+      };
+
+      package = mkOption {
+        description = "Elixir 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;
       };
     };
 
@@ -97,12 +97,8 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
+      vim.lsp.lspconfig.enable = true;
-        mapListToAttrs (n: {
+      vim.lsp.lspconfig.sources.elixir-lsp = servers.${cfg.lsp.server}.lspConfig;
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
     })
 
     (mkIf cfg.format.enable {

modules/plugins/languages/gleam.nix

@@ -8,21 +8,27 @@
   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.nvim.types) mkGrammarOption;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.gleam;
 
-  defaultServers = ["gleam"];
+  defaultServer = "gleam";
   servers = {
     gleam = {
-      enable = true;
+      package = pkgs.gleam;
-      cmd = [(getExe pkgs.gleam) "lsp"];
+      lspConfig = ''
-      filetypes = ["gleam"];
+        lspconfig.gleam.setup{
-      root_markers = [ "gleam.toml" ".git" ];
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/gleam", "lsp"}''
+        }
+        }
+      '';
     };
   };
 in {
@@ -36,10 +42,17 @@ in {
 
     lsp = {
       enable = mkEnableOption "Gleam LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkOption {
+
+      server = mkOption {
+        type = enum (attrNames servers);
+        default = defaultServer;
         description = "Gleam LSP server to use";
-        type = listOf (enum (attrNames servers));
+      };
-        default = defaultServers;
+
+      package = mkOption {
+        type = either package (listOf str);
+        default = servers.${cfg.lsp.server}.package;
+        description = "Gleam LSP server package, or the command to run as a list of strings";
       };
     };
   };
@@ -51,12 +64,8 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
+      vim.lsp.lspconfig.enable = true;
-        mapListToAttrs (n: {
+      vim.lsp.lspconfig.sources.gleam-lsp = servers.${cfg.lsp.server}.lspConfig;
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
     })
   ]);
 }