diff --git a/modules/dependencies.nix b/modules/dependencies.nix index 5ee17b40..c7f29d33 100644 --- a/modules/dependencies.nix +++ b/modules/dependencies.nix @@ -49,6 +49,10 @@ let websocat.default = "websocat"; wezterm.default = "wezterm"; which.default = "which"; + xxd.default = [ + "unixtools" + "xxd" + ]; yazi.default = "yazi"; yq.default = "yq"; zk.default = "zk"; diff --git a/plugins/by-name/hex/default.nix b/plugins/by-name/hex/default.nix index 292deab6..6f398eed 100644 --- a/plugins/by-name/hex/default.nix +++ b/plugins/by-name/hex/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ lib, ... }: let inherit (lib.nixvim) defaultNullOpts mkNullOrLuaFn; in @@ -9,14 +9,17 @@ lib.nixvim.plugins.mkNeovimPlugin { maintainers = [ lib.maintainers.GaetanLepage ]; - extraOptions = { - xxdPackage = lib.mkPackageOption pkgs [ - "unixtools" - "xxd" - ] { nullable = true; }; - }; + imports = [ + # TODO: added 2025-04-07, remove after 25.05 + (lib.nixvim.mkRemovedPackageOptionModule { + plugin = "hex"; + packageName = "xxd"; + }) + ]; - extraConfig = cfg: { extraPackages = [ cfg.xxdPackage ]; }; + extraConfig = { + dependencies.xxd.enable = lib.mkDefault true; + }; settingsOptions = { dump_cmd = defaultNullOpts.mkStr "xxd -g 1 -u" ''