diff --git a/modules/dependencies.nix b/modules/dependencies.nix index bb140182..76f183f7 100644 --- a/modules/dependencies.nix +++ b/modules/dependencies.nix @@ -17,6 +17,7 @@ let example = [ "gitMinimal" ]; }; go.default = "go"; + lean.default = "lean4"; nodejs = { default = "nodejs"; example = "pkgs.nodejs_22"; diff --git a/plugins/by-name/lean/default.nix b/plugins/by-name/lean/default.nix index 584e7f2c..3f174278 100644 --- a/plugins/by-name/lean/default.nix +++ b/plugins/by-name/lean/default.nix @@ -1,6 +1,5 @@ { lib, - pkgs, ... }: let @@ -14,12 +13,13 @@ lib.nixvim.plugins.mkNeovimPlugin { maintainers = [ lib.maintainers.khaneliman ]; - extraOptions = { - leanPackage = lib.mkPackageOption pkgs "lean" { - nullable = true; - default = "lean4"; - }; - }; + imports = [ + # TODO: added 2025-04-07, remove after 25.05 + (lib.nixvim.mkRemovedPackageOptionModule { + plugin = "lean"; + packageName = "lean"; + }) + ]; settingsOptions = { lsp = defaultNullOpts.mkNullable (types.submodule { @@ -184,8 +184,8 @@ lib.nixvim.plugins.mkNeovimPlugin { }; }; - extraConfig = cfg: { - extraPackages = [ cfg.leanPackage ]; + extraConfig = { + dependencies.lean.enable = lib.mkDefault true; }; # TODO: Deprecated in 2025-01-31