convert gleam module

lib/languages.nix

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

modules/plugins/languages/bash.nix

@@ -13,6 +13,7 @@
   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,13 +4,15 @@
   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) either listOf package str;
+  inherit (lib.types) enum 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,6 +6,7 @@
 }: 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;
@@ -14,26 +15,31 @@
   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;
 
-  defaultServer = "dart";
+  defaultServers = ["dart"];
   servers = {
     dart = {
-      package = pkgs.dart;
+      enable = true;
-      lspConfig = ''
+      cmd = [(getExe pkgs.dart) "language-server" "--protocol=lsp"];
-        lspconfig.dartls.setup{
+      filetypes = ["dart"];
-          capabilities = capabilities;
+      root_markers = ["pubspec.yaml"];
-          on_attach=default_on_attach;
+      init_options = {
-          cmd = ${
+        onlyAnalyzeProjectsWithOpenFiles = true;
-          if isList cfg.lsp.package
+        suggestFromUnimportedLibraries = true;
-          then expToLua cfg.lsp.package
+        closingLabels = true;
-          else ''{"${cfg.lsp.package}/bin/dart", "language-server", "--protocol=lsp"}''
+        outline = true;
+        flutterOutline = true;
+      };
+      settings = {
+        dart = {
+          completeFunctionCalls = true;
+          showTodos = true;
         };
-          ${optionalString (cfg.lsp.opts != null) "init_options = ${cfg.lsp.dartOpts}"}
+      };
-        }
-      '';
     };
   };
 in {
@@ -46,23 +52,11 @@ in {
     };
 
     lsp = {
-      enable = mkEnableOption "Dart LSP support";
+      enable = mkEnableOption "Dart LSP support" // {default = config.vim.lsp.enable;};
-      server = mkOption {
+      servers = mkOption {
-        description = "The Dart LSP server to use";
+        description = "Dart LSP server to use";
-        type = enum (attrNames servers);
+        type = listOf (enum (attrNames servers));
-        default = defaultServer;
+        default = defaultServers;
-      };
-      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";
       };
     };
 
@@ -131,19 +125,23 @@ in {
     };
   };
 
-  config.vim = mkIf cfg.enable (mkMerge [
+  config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.treesitter.enable {
-      treesitter.enable = true;
+      vim.treesitter.enable = true;
-      treesitter.grammars = [cfg.treesitter.package];
+      vim.treesitter.grammars = [cfg.treesitter.package];
     })
 
     (mkIf cfg.lsp.enable {
-      lsp.lspconfig.enable = true;
+      vim.lsp.servers =
-      lsp.lspconfig.sources.dart-lsp = servers.${cfg.lsp.server}.lspConfig;
+        mapListToAttrs (n: {
+          name = n;
+          value = servers.${n};
+        })
+        cfg.lsp.servers;
     })
 
     (mkIf ftcfg.enable {
-      startPlugins = [
+      vim.startPlugins = [
         (
           if ftcfg.enableNoResolvePatch
           then "flutter-tools-patched"
@@ -152,7 +150,7 @@ in {
         "plenary-nvim"
       ];
 
-      pluginRC.flutter-tools = entryAfter ["lsp-setup"] ''
+      vim.pluginRC.flutter-tools = entryAfter ["lsp-servers"] ''
         require('flutter-tools').setup {
           ${optionalString (ftcfg.flutterPackage != null) "flutter_path = \"${ftcfg.flutterPackage}/bin/flutter\","}
           lsp = {

modules/plugins/languages/elixir.nix

@@ -8,29 +8,37 @@
   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;
 
-  defaultServer = "elixirls";
+  defaultServers = ["elixirls"];
   servers = {
     elixirls = {
-      package = pkgs.elixir-ls;
+      enable = true;
-      lspConfig = ''
+      cmd = [(getExe pkgs.elixir-ls)];
-        -- elixirls setup
+      filetypes = ["elixir" "eelixir" "heex" "surface"];
-        lspconfig.elixirls.setup {
+      root_dir =
-          capabilities = capabilities,
+        mkLuaInline
-          on_attach = default_on_attach,
+        /*
-          cmd = ${
+        lua
-          if isList cfg.lsp.package
+        */
-          then expToLua cfg.lsp.package
+        ''
-          else ''{"${cfg.lsp.package}/bin/elixir-ls"}''
+          function(bufnr, on_dir)
-        }
+            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
+        '';
     };
   };
 
@@ -54,18 +62,10 @@ in {
 
     lsp = {
       enable = mkEnableOption "Elixir LSP support" // {default = config.vim.lsp.enable;};
-
+      servers = mkOption {
-      server = mkOption {
         description = "Elixir LSP server to use";
-        type = enum (attrNames servers);
+        type = listOf (enum (attrNames servers));
-        default = defaultServer;
+        default = defaultServers;
-      };
-
-      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,8 +97,12 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.lspconfig.enable = true;
+      vim.lsp.servers =
-      vim.lsp.lspconfig.sources.elixir-lsp = servers.${cfg.lsp.server}.lspConfig;
+        mapListToAttrs (n: {
+          name = n;
+          value = servers.${n};
+        })
+        cfg.lsp.servers;
     })
 
     (mkIf cfg.format.enable {

modules/plugins/languages/gleam.nix

@@ -8,27 +8,21 @@
   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;
 
-  defaultServer = "gleam";
+  defaultServers = ["gleam"];
   servers = {
     gleam = {
-      package = pkgs.gleam;
+      enable = true;
-      lspConfig = ''
+      cmd = [(getExe pkgs.gleam) "lsp"];
-        lspconfig.gleam.setup{
+      filetypes = ["gleam"];
-          capabilities = capabilities,
+      root_markers = [ "gleam.toml" ".git" ];
-          on_attach = default_on_attach,
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/gleam", "lsp"}''
-        }
-        }
-      '';
     };
   };
 in {
@@ -42,17 +36,10 @@ 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";
       };
     };
   };
@@ -64,8 +51,12 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.lspconfig.enable = true;
+      vim.lsp.servers =
-      vim.lsp.lspconfig.sources.gleam-lsp = servers.${cfg.lsp.server}.lspConfig;
+        mapListToAttrs (n: {
+          name = n;
+          value = servers.${n};
+        })
+        cfg.lsp.servers;
     })
   ]);
 }