From a9df4724b58d9f0344b13b46339ddfc9d0debc48 Mon Sep 17 00:00:00 2001
From: Snoweuph <snow@euph.email>
Date: Sat, 11 Apr 2026 12:40:11 +0200
Subject: [PATCH] languages/yaml: refactor lsp.servers to use
 lsp/presets/<name>

---
 modules/plugins/languages/yaml.nix | 54 ++++++------------------------
 1 file changed, 11 insertions(+), 43 deletions(-)

diff --git a/modules/plugins/languages/yaml.nix b/modules/plugins/languages/yaml.nix
index 097b98c5..bba0eba3 100644
--- a/modules/plugins/languages/yaml.nix
+++ b/modules/plugins/languages/yaml.nix
@@ -4,48 +4,16 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames;
-  inherit (lib.generators) mkLuaInline;
   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.yaml;
 
-  on_attach =
-    if config.vim.languages.helm.lsp.enable && config.vim.languages.helm.enable
-    then
-      mkLuaInline ''
-        function(client, bufnr)
-          local filetype = vim.bo[bufnr].filetype
-          if filetype == "helm" then
-            client.stop()
-          end
-        end
-      ''
-    else null;
-
   defaultServers = ["yaml-language-server"];
-  servers = {
-    yaml-language-server = {
-      enable = true;
-      cmd = [(getExe pkgs.yaml-language-server) "--stdio"];
-      filetypes = ["yaml" "yaml.docker-compose" "yaml.gitlab" "yaml.helm-values"];
-      root_markers = [".git"];
-      inherit on_attach;
-      # -- https://github.com/redhat-developer/vscode-redhat-telemetry#how-to-disable-telemetry-reporting
-      settings = {
-        redhat = {
-          telemetry = {
-            enabled = false;
-          };
-        };
-      };
-    };
-  };
+  servers = ["yaml-language-server"];
 in {
   options.vim.languages.yaml = {
     enable = mkEnableOption "YAML language support";
@@ -69,7 +37,7 @@ in {
           defaultText = literalExpression "config.vim.lsp.enable";
         };
       servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.yaml.lsp.servers" (enum (attrNames servers));
+        type = listOf (enum servers);
         default = defaultServers;
         description = "Yaml LSP server to use";
       };
@@ -83,12 +51,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 = ["yaml"];
+        });
+      };
     })
   ]);
 }