From 56b62f79ea43fd5069e7ad9eb3f04b3dc088175a Mon Sep 17 00:00:00 2001
From: Snoweuph <snow@euph.email>
Date: Sun, 12 Apr 2026 15:34:30 +0200
Subject: [PATCH] languages/gleam: refactor lsp.servers to use
 lsp/presets/<name>

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

diff --git a/modules/plugins/languages/gleam.nix b/modules/plugins/languages/gleam.nix
index 8007c8bc..a79fcb6d 100644
--- a/modules/plugins/languages/gleam.nix
+++ b/modules/plugins/languages/gleam.nix
@@ -4,25 +4,16 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption literalExpression;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.meta) getExe;
-  inherit (lib.types) enum;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib) genAttrs;
+  inherit (lib.types) enum listOf;
+  inherit (lib.nvim.types) mkGrammarOption;
 
   cfg = config.vim.languages.gleam;
 
   defaultServers = ["gleam"];
-  servers = {
-    gleam = {
-      enable = true;
-      cmd = [(getExe pkgs.gleam) "lsp"];
-      filetypes = ["gleam"];
-      root_markers = ["gleam.toml" ".git"];
-    };
-  };
+  servers = ["gleam"];
 in {
   options.vim.languages.gleam = {
     enable = mkEnableOption "Gleam language support";
@@ -45,7 +36,7 @@ in {
           defaultText = literalExpression "config.vim.lsp.enable";
         };
       servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.gleam.lsp.servers" (enum (attrNames servers));
+        type = listOf (enum servers);
         default = defaultServers;
         description = "Gleam LSP server to use";
       };
@@ -59,12 +50,12 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim.lsp = {
+        presets = genAttrs cfg.lsp.servers (_: {enable = true;});
+        servers = genAttrs cfg.lsp.servers (_: {
+          filetypes = ["gleam"];
+        });
+      };
     })
   ]);
 }