mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-20 16:15:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

modules/dependencies: add ueberzug

Browse source
This commit is contained in:
Gaetan Lepage 2025-04-06 17:21:36 +02:00 • committed by nix-infra-bot
parent cfd4b61262
commit 30c4d00b72
4 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/dependencies.nix
View file

@ -9,6 +9,7 @@ let
packages = { packages = {
curl.default = "curl"; curl.default = "curl";
ueberzug.default = "ueberzugpp";
}; };
mkDependencyOption = name: properties: { mkDependencyOption = name: properties: {

21
plugins/by-name/image/default.nix
View file

@ -1,6 +1,5 @@
{ {
lib, lib,
pkgs,
... ...
}: }:
let let
@ -15,24 +14,13 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ]; maintainers = [ lib.maintainers.GaetanLepage ];
# TODO: option deprecations added 2025-03-20. Remove after 25.05 # 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) inherit (import ./deprecations.nix lib)
deprecateExtraOptions deprecateExtraOptions
optionsRenamedToSettings optionsRenamedToSettings
imports 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 = { settingsOptions = {
backend = backend =
defaultNullOpts.mkEnumFirstDefault defaultNullOpts.mkEnumFirstDefault
@ -139,8 +127,9 @@ lib.nixvim.plugins.mkNeovimPlugin {
extraConfig = cfg: { extraConfig = cfg: {
# In theory, we could remove that if the user explicitly disables `downloadRemoteImages` for # In theory, we could remove that if the user explicitly disables `downloadRemoteImages` for
# all integrations but shipping `curl` is not too heavy. # all integrations but shipping `curl` is not too heavy.
dependencies.curl.enable = lib.mkDefault true; dependencies = {
curl.enable = lib.mkDefault true;
extraPackages = lib.optional (cfg.settings.backend == "ueberzug") cfg.ueberzugPackage; ueberzug.enable = lib.mkIf (cfg.settings.backend == "ueberzug") (lib.mkDefault true);
};
}; };
} }

4
plugins/by-name/image/deprecations.nix
View file

@ -22,5 +22,9 @@ lib: {
plugin = "image"; plugin = "image";
packageName = "curl"; packageName = "curl";
}) })
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "image";
packageName = "ueberzug";
})
]; ];
} }

2
tests/test-sources/plugins/by-name/image/default.nix
View file

@ -94,11 +94,11 @@
dependencies = { dependencies = {
curl.enable = false; curl.enable = false;
ueberzug.enable = false;
}; };
plugins.image = { plugins.image = {
enable = true; enable = true;
settings.backend = "kitty"; settings.backend = "kitty";
ueberzugPackage = null;
}; };
}; };
} }