languages/ruby: refactor lsp.servers to use lsp/presets/<name>

docs/manual/release-notes/rl-0.9.md

@@ -81,6 +81,8 @@
 
 - Renamed `tofuls-tf` and `tofuls-hcl` to `tofu-ls`.
 
+- Renamed `ruby_lsp` to `ruby-lsp`.
+
 - Removed `languages.tailwind` which only provided an LSP. Use
   `lsp.presets.tailwindcss-language-server` instead.
 

modules/plugins/languages/ruby.nix

@@ -6,46 +6,17 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption literalExpression;
+  inherit (lib) genAttrs;
   inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf;
-  inherit (lib.types) enum;
+  inherit (lib.types) enum listOf;
   inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.ruby;
 
   defaultServers = ["solargraph"];
-  servers = {
+  servers = ["ruby-lsp" "solargraph"];
-    ruby_lsp = {
-      enable = true;
-      cmd = [(getExe pkgs.ruby-lsp)];
-      filetypes = ["ruby" "eruby"];
-      root_markers = ["Gemfile" ".git"];
-      init_options = {
-        formatter = "auto";
-      };
-    };
-
-    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;
-      };
-    };
-  };
 
   # testing
 
@@ -85,7 +56,7 @@ in {
         };
 
       servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.ruby.lsp.servers" (enum (attrNames servers));
+        type = listOf (enum servers);
         default = defaultServers;
         description = "Ruby LSP server to use";
       };
@@ -121,12 +92,12 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
+      vim.lsp = {
-        mapListToAttrs (n: {
+        presets = genAttrs cfg.lsp.servers (_: {enable = true;});
-          name = n;
+        servers = genAttrs cfg.lsp.servers (_: {
-          value = servers.${n};
+          filetypes = ["ruby" "eruby"];
-        })
+        });
-        cfg.lsp.servers;
+      };
     })
 
     (mkIf cfg.format.enable {