diff --git a/modules/dependencies.nix b/modules/dependencies.nix index 660d3738..a51a8c49 100644 --- a/modules/dependencies.nix +++ b/modules/dependencies.nix @@ -21,6 +21,7 @@ let go.default = "go"; lean.default = "lean4"; ledger.default = "ledger"; + manix.default = "manix"; nodejs = { default = "nodejs"; example = "pkgs.nodejs_22"; diff --git a/plugins/by-name/telescope/extensions/manix.nix b/plugins/by-name/telescope/extensions/manix.nix index 64a1d87c..90e8a7d4 100644 --- a/plugins/by-name/telescope/extensions/manix.nix +++ b/plugins/by-name/telescope/extensions/manix.nix @@ -1,6 +1,5 @@ { lib, - pkgs, ... }: let @@ -12,6 +11,18 @@ mkExtension { name = "manix"; package = "telescope-manix"; + imports = [ + # TODO: added 2025-04-07, remove after 25.05 + (lib.nixvim.mkRemovedPackageOptionModule { + plugin = [ + "telescope" + "extensions" + "manix" + ]; + packageName = "manix"; + }) + ]; + settingsOptions = { manix_args = defaultNullOpts.mkListOf lib.types.str [ ] "CLI arguments to pass to manix."; @@ -24,13 +35,7 @@ mkExtension { cword = true; }; - extraOptions = { - manixPackage = lib.mkPackageOption pkgs "manix" { - nullable = true; - }; - }; - - extraConfig = cfg: { - extraPackages = [ cfg.manixPackage ]; + extraConfig = { + dependencies.manix.enable = lib.mkDefault true; }; } diff --git a/tests/test-sources/plugins/by-name/telescope/manix.nix b/tests/test-sources/plugins/by-name/telescope/manix.nix index 5d317ef7..b6a35b1d 100644 --- a/tests/test-sources/plugins/by-name/telescope/manix.nix +++ b/tests/test-sources/plugins/by-name/telescope/manix.nix @@ -40,14 +40,15 @@ }; no-packages = { - plugins.telescope = { - enable = true; - - extensions.manix = { + plugins = { + telescope = { enable = true; - manixPackage = null; + + extensions.manix.enable = true; }; + web-devicons.enable = false; }; - plugins.web-devicons.enable = false; + + dependencies.manix.enable = false; }; }