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

---
 docs/manual/release-notes/rl-0.9.md     |  4 +++
 modules/plugins/languages/terraform.nix | 34 ++++++++-----------------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md
index 7bda239a..81d1abe5 100644
--- a/docs/manual/release-notes/rl-0.9.md
+++ b/docs/manual/release-notes/rl-0.9.md
@@ -77,6 +77,10 @@
 
 - Renamed `vala_ls` to `vala-language-server`.
 
+- Renamed `terraformls-tf` to `terraform-ls`.
+
+- Renamed `tofuls-tf` to `tofu-ls`.
+
 ## Changelog {#sec-release-0-9-changelog}
 
 [SecBear](https://github.com/SecBear):
diff --git a/modules/plugins/languages/terraform.nix b/modules/plugins/languages/terraform.nix
index fbcc77da..a3a22048 100644
--- a/modules/plugins/languages/terraform.nix
+++ b/modules/plugins/languages/terraform.nix
@@ -7,28 +7,16 @@
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption literalExpression;
   inherit (lib.modules) mkIf mkMerge;
+  inherit (lib) genAttrs;
   inherit (lib.meta) getExe;
   inherit (lib.types) enum listOf;
-  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
+  inherit (lib.nvim.types) mkGrammarOption;
   inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.terraform;
 
-  defaultServers = ["tofuls-tf"];
-  servers = {
-    terraformls-tf = {
-      enable = true;
-      cmd = [(getExe pkgs.terraform-ls) "serve"];
-      filetypes = ["terraform" "terraform-vars" "tf"];
-      root_markers = [".terraform" ".git"];
-    };
-    tofuls-tf = {
-      enable = true;
-      cmd = [(getExe pkgs.tofu-ls) "serve"];
-      filetypes = ["terraform" "terraform-vars" "tf"];
-      root_markers = [".terraform" ".git"];
-    };
-  };
+  defaultServers = ["tofu-ls"];
+  servers = ["terraform-ls" "tofu-ls"];
 
   defaultFormat = ["tofu-fmt"];
   formats = {
@@ -65,7 +53,7 @@ in {
           defaultText = literalExpression "config.vim.lsp.enable";
         };
       servers = mkOption {
-        type = listOf (enum (attrNames servers));
+        type = listOf (enum servers);
         default = defaultServers;
         description = "Terraform LSP server to use";
       };
@@ -93,13 +81,11 @@ 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 = ["terraform" "terraform-vars" "tf"];
+        });
       };
     })