plugins/efmls-configs: use dependencies for efm-langserver

modules/dependencies.nix

@@ -110,6 +110,7 @@ in
       curl.default = "curl";
       direnv.default = "direnv";
       distant.default = "distant";
+      efm-langserver.default = "efm-langserver";
       fish.default = "fish";
       flutter.default = "flutter";
       fzf = {

plugins/by-name/efmls-configs/default.nix

@@ -20,10 +20,6 @@ in
       ];
     };
 
-    efmLangServerPackage = lib.mkPackageOption pkgs "efm-langserver" {
-      nullable = true;
-    };
-
     externallyManagedPackages = lib.mkOption {
       type = with lib.types; either (enum [ "all" ]) (listOf str);
       description = ''
@@ -199,11 +195,21 @@ in
         config.settings.languages = setupOptions;
       };
 
-      extraPackages = [ cfg.efmLangServerPackage ] ++ (map (v: cfg.toolPackages.${v}) nixvimPkgs.right);
+      extraPackages = map (name: cfg.toolPackages.${name}) nixvimPkgs.right;
+      dependencies.efm-langserver.enable = lib.mkDefault true;
     };
 
-  imports = lib.singleton {
+  imports = [
+    {
       # Propagate setup warnings
       inherit (config.plugins.efmls-configs.setup) warnings;
-  };
+    }
+
+    # TODO: added 2025-10-23, remove after 26.05
+    (lib.nixvim.mkRemovedPackageOptionModule {
+      plugin = "efmls-configs";
+      oldPackageName = "efmLangServer";
+      packageName = "efm-langserver";
+    })
+  ];
 }

tests/test-sources/plugins/by-name/efmls-configs/default.nix

@@ -134,9 +134,7 @@
   };
 
   no-packages = {
-    plugins.efmls-configs = {
-      enable = true;
-      efmLangServerPackage = null;
-    };
+    plugins.efmls-configs.enable = true;
+    dependencies.efm-langserver.enable = false;
   };
 }