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

---
 modules/plugins/languages/kotlin.nix | 48 ++++++----------------------
 1 file changed, 10 insertions(+), 38 deletions(-)

diff --git a/modules/plugins/languages/kotlin.nix b/modules/plugins/languages/kotlin.nix
index 63cbe428..27b9a14b 100644
--- a/modules/plugins/languages/kotlin.nix
+++ b/modules/plugins/languages/kotlin.nix
@@ -6,44 +6,16 @@
 }: let
   inherit (lib.options) literalExpression mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.meta) getExe' getExe;
-  inherit (builtins) attrNames;
+  inherit (lib.meta) getExe;
+  inherit (lib) genAttrs;
   inherit (lib.types) enum listOf;
   inherit (lib.nvim.types) mkGrammarOption diagnostics;
-  inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.kotlin;
 
   defaultServers = ["kotlin-language-server"];
-  servers = {
-    kotlin-language-server = {
-      enable = true;
-      cmd = [(getExe' pkgs.kotlin-language-server "kotlin-language-server")];
-      filetypes = ["kotlin"];
-      root_markers = [
-        "settings.gradle" # Gradle (multi-project)
-        "settings.gradle.kts" # Gradle (multi-project)
-        "build.xml" # Ant
-        "pom.xml" # Maven
-        "build.gradle" # Gradle
-        "build.gradle.kts" # gradle
-      ];
-      init_options = {
-        storagePath = mkLuaInline "
-        vim.fs.root(vim.fn.expand '%:p:h',
-          {
-            'settings.gradle', -- Gradle (multi-project)
-            'settings.gradle.kts', -- Gradle (multi-project)
-            'build.xml', -- Ant
-            'pom.xml', -- Maven
-            'build.gradle', -- Gradle
-            'build.gradle.kts', -- Gradle
-          }
-        )";
-      };
-    };
-  };
+  servers = ["kotlin-language-server"];
 
   defaultDiagnosticsProvider = ["ktlint"];
   diagnosticsProviders = {
@@ -73,7 +45,7 @@ in {
           defaultText = literalExpression "config.vim.lsp.enable";
         };
       servers = mkOption {
-        type = listOf (enum (attrNames servers));
+        type = listOf (enum servers);
         default = defaultServers;
         description = "Kotlin LSP server to use";
       };
@@ -112,12 +84,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 = ["kotlin"];
+        });
+      };
     })
   ]);
 }