From 6a8325639fe2f63cae1cda76506495d951dac65b Mon Sep 17 00:00:00 2001
From: ppenguin <hieronymusv@gmail.com>
Date: Fri, 9 Jan 2026 10:05:53 +0100
Subject: [PATCH] changes from review

---
 modules/plugins/languages/hcl.nix       | 19 +++++++------------
 modules/plugins/languages/terraform.nix | 16 +++++-----------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/modules/plugins/languages/hcl.nix b/modules/plugins/languages/hcl.nix
index db24b116..529cc44e 100644
--- a/modules/plugins/languages/hcl.nix
+++ b/modules/plugins/languages/hcl.nix
@@ -14,17 +14,17 @@
 
   cfg = config.vim.languages.hcl;
 
-  defaultServers = ["tofuls"];
+  defaultServers = ["tofuls-hcl"];
   servers = {
-    terraformls = {
+    terraformls-hcl = {
       enable = true;
-      cmd = mkDefault [(getExe pkgs.terraform-ls) "serve"]; # NOTE: mkDefault to avoid clashes with terraform defs
+      cmd = [(getExe pkgs.terraform-ls) "serve"]; # NOTE: mkDefault to avoid clashes with terraform defs
       filetypes = ["hcl"];
       root_markers = [".git"];
     };
-    tofuls = {
+    tofuls-hcl = {
       enable = true;
-      cmd = mkDefault [(getExe pkgs.tofu-ls) "serve"]; # NOTE: mkDefault to avoid clashes with terraform defs
+      cmd = [(getExe pkgs.tofu-ls) "serve"]; # NOTE: mkDefault to avoid clashes with terraform defs
       filetypes = ["hcl"];
       root_markers = [".terraform" ".git"];
     };
@@ -47,14 +47,12 @@ in {
     enable = mkEnableOption "HCL support";
 
     treesitter = {
-      enable =
-        mkEnableOption "HCL treesitter" // {default = config.vim.languages.enableTreesitter;};
+      enable = mkEnableOption "HCL treesitter" // {default = config.vim.languages.enableTreesitter;};
       package = mkGrammarOption pkgs "hcl";
     };
 
     lsp = {
-      enable =
-        mkEnableOption "HCL LSP support" // {default = config.vim.lsp.enable;};
+      enable = mkEnableOption "HCL LSP support" // {default = config.vim.lsp.enable;};
       servers = mkOption {
         type = listOf (enum (attrNames servers));
         default = defaultServers;
@@ -109,9 +107,6 @@ in {
             value = servers.${n};
           })
           cfg.lsp.servers;
-        extraPackages =
-          (lib.optionals (elem "terraformls" cfg.lsp.servers) [pkgs.terraform])
-          ++ (lib.optionals (elem "tofuls" cfg.lsp.servers) [pkgs.opentofu]);
       };
     })
 
diff --git a/modules/plugins/languages/terraform.nix b/modules/plugins/languages/terraform.nix
index 28cc2617..4d91cf12 100644
--- a/modules/plugins/languages/terraform.nix
+++ b/modules/plugins/languages/terraform.nix
@@ -14,15 +14,15 @@
 
   cfg = config.vim.languages.terraform;
 
-  defaultServers = ["tofuls"];
+  defaultServers = ["tofuls-tf"];
   servers = {
-    terraformls = {
+    terraformls-tf = {
       enable = true;
       cmd = [(getExe pkgs.terraform-ls) "serve"];
       filetypes = ["terraform" "terraform-vars" "tf"];
       root_markers = [".terraform" ".git"];
     };
-    tofuls = {
+    tofuls-tf = {
       enable = true;
       cmd = [(getExe pkgs.tofu-ls) "serve"];
       filetypes = ["terraform" "terraform-vars" "tf"];
@@ -48,15 +48,12 @@ in {
     enable = mkEnableOption "Terraform support";
 
     treesitter = {
-      enable =
-        mkEnableOption "Terraform treesitter" // {default = config.vim.languages.enableTreesitter;};
+      enable = mkEnableOption "Terraform treesitter" // {default = config.vim.languages.enableTreesitter;};
       package = mkGrammarOption pkgs "terraform";
     };
 
     lsp = {
-      enable =
-        mkEnableOption "Terraform LSP support (terraform-ls)" // {default = config.vim.lsp.enable;};
-
+      enable = mkEnableOption "Terraform LSP support (terraform-ls)" // {default = config.vim.lsp.enable;};
       servers = mkOption {
         type = listOf (enum (attrNames servers));
         default = defaultServers;
@@ -92,9 +89,6 @@ in {
             value = servers.${n};
           })
           cfg.lsp.servers;
-        extraPackages =
-          (lib.optionals (elem "terraformls" cfg.lsp.servers) [pkgs.terraform])
-          ++ (lib.optionals (elem "tofuls" cfg.lsp.servers) [pkgs.opentofu]);
       };
     })