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

---
 modules/plugins/languages/just.nix | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/modules/plugins/languages/just.nix b/modules/plugins/languages/just.nix
index 210941bd..2570da76 100644
--- a/modules/plugins/languages/just.nix
+++ b/modules/plugins/languages/just.nix
@@ -4,25 +4,16 @@
   pkgs,
   ...
 }: let
-  inherit (builtins) attrNames;
   inherit (lib.options) literalExpression mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.meta) getExe;
+  inherit (lib) genAttrs;
   inherit (lib.types) enum listOf;
-  inherit (lib.nvim.attrsets) mapListToAttrs;
   inherit (lib.nvim.types) mkGrammarOption;
 
   cfg = config.vim.languages.just;
 
   defaultServers = ["just-lsp"];
-  servers = {
-    just-lsp = {
-      enable = true;
-      cmd = [(getExe pkgs.just-lsp)];
-      filetypes = ["just"];
-      root_markers = [".git" "justfile"];
-    };
-  };
+  servers = ["just-lsp"];
 in {
   options.vim.languages.just = {
     enable = mkEnableOption "Just support";
@@ -45,7 +36,7 @@ in {
           defaultText = literalExpression "config.vim.lsp.enable";
         };
       servers = mkOption {
-        type = listOf (enum (attrNames servers));
+        type = listOf (enum servers);
         default = defaultServers;
         description = "Just LSP server to use";
       };
@@ -61,12 +52,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 = ["just"];
+        });
+      };
     })
   ]);
 }