plugins/lsp: Correctly mark servers as disabled if the lsp plugin is …

…disabled
nix-community · Nov 19, 2024 · c674f10 · c674f10
1 parent 31eb9d8
commit c674f10
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/plugins/lsp/language-servers/_mk-lsp.nix b/plugins/lsp/language-servers/_mk-lsp.nix
@@ -30,6 +30,8 @@ with lib;
 let
   cfg = config.plugins.lsp.servers.${name};
   opt = options.plugins.lsp.servers.${name};
+
+  enabled = config.plugins.lsp.enable && cfg.enable;
 in
 {
   meta.nixvimInfo = {
@@ -131,7 +133,7 @@ in
     } // extraOptions;
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf enabled {
     extraPackages = [ cfg.package ];
 
     plugins.lsp.enabledServers = [
@@ -168,7 +170,7 @@ in
       (mkRemovedOptionModule (
         basePluginPath ++ [ "extraSettings" ]
       ) "You can use `${basePluginPathString}.extraOptions.settings` instead.")
-      (lib.mkIf cfg.enable (extraConfig cfg))
+      (lib.mkIf enabled (extraConfig cfg))
     ]
     # Add an alias (with warning) for the lspconfig server name, if different to `name`.
     # Note: users may use lspconfig's docs to guess the `plugins.lsp.servers.*` name