diff --git a/modules/dependencies.nix b/modules/dependencies.nix index e6493dc1..c257c800 100644 --- a/modules/dependencies.nix +++ b/modules/dependencies.nix @@ -9,6 +9,7 @@ let packages = { curl.default = "curl"; + ueberzug.default = "ueberzugpp"; }; mkDependencyOption = name: properties: { diff --git a/plugins/by-name/image/default.nix b/plugins/by-name/image/default.nix index de736049..a362acb4 100644 --- a/plugins/by-name/image/default.nix +++ b/plugins/by-name/image/default.nix @@ -1,6 +1,5 @@ { lib, - pkgs, ... }: let @@ -15,24 +14,13 @@ lib.nixvim.plugins.mkNeovimPlugin { maintainers = [ lib.maintainers.GaetanLepage ]; # TODO: option deprecations added 2025-03-20. Remove after 25.05 - # TODO: curlPackage deprecation added 2025-04-06. Remove after 25.05 + # TODO: curlPackage and ueberzugPackage deprecations added 2025-04-06. Remove after 25.05 inherit (import ./deprecations.nix lib) deprecateExtraOptions optionsRenamedToSettings imports ; - extraOptions = { - ueberzugPackage = lib.mkOption { - type = with types; nullOr package; - default = pkgs.ueberzugpp; - defaultText = lib.literalExpression "pkgs.ueberzugpp"; - description = '' - Package to automatically install if `settings.backend.backend` is set to `"ueberzug"`. - ''; - }; - }; - settingsOptions = { backend = defaultNullOpts.mkEnumFirstDefault @@ -139,8 +127,9 @@ lib.nixvim.plugins.mkNeovimPlugin { extraConfig = cfg: { # In theory, we could remove that if the user explicitly disables `downloadRemoteImages` for # all integrations but shipping `curl` is not too heavy. - dependencies.curl.enable = lib.mkDefault true; - - extraPackages = lib.optional (cfg.settings.backend == "ueberzug") cfg.ueberzugPackage; + dependencies = { + curl.enable = lib.mkDefault true; + ueberzug.enable = lib.mkIf (cfg.settings.backend == "ueberzug") (lib.mkDefault true); + }; }; } diff --git a/plugins/by-name/image/deprecations.nix b/plugins/by-name/image/deprecations.nix index 6fbd4203..1336fd2c 100644 --- a/plugins/by-name/image/deprecations.nix +++ b/plugins/by-name/image/deprecations.nix @@ -22,5 +22,9 @@ lib: { plugin = "image"; packageName = "curl"; }) + (lib.nixvim.mkRemovedPackageOptionModule { + plugin = "image"; + packageName = "ueberzug"; + }) ]; } diff --git a/tests/test-sources/plugins/by-name/image/default.nix b/tests/test-sources/plugins/by-name/image/default.nix index 6007a72f..34d5c2d5 100644 --- a/tests/test-sources/plugins/by-name/image/default.nix +++ b/tests/test-sources/plugins/by-name/image/default.nix @@ -94,11 +94,11 @@ dependencies = { curl.enable = false; + ueberzug.enable = false; }; plugins.image = { enable = true; settings.backend = "kitty"; - ueberzugPackage = null; }; }; }