diff --git a/modules/dependencies.nix b/modules/dependencies.nix index a51a8c49..7aacbbd2 100644 --- a/modules/dependencies.nix +++ b/modules/dependencies.nix @@ -31,6 +31,7 @@ let typst.default = "typst"; ueberzug.default = "ueberzugpp"; which.default = "which"; + yazi.default = "yazi"; }; mkDependencyOption = name: properties: { diff --git a/plugins/by-name/yazi/default.nix b/plugins/by-name/yazi/default.nix index ed67f065..1285725f 100644 --- a/plugins/by-name/yazi/default.nix +++ b/plugins/by-name/yazi/default.nix @@ -1,6 +1,5 @@ { lib, - pkgs, ... }: let @@ -22,14 +21,16 @@ lib.nixvim.plugins.mkNeovimPlugin { See the [upstream docs](https://github.com/mikavilpas/yazi.nvim?tab=readme-ov-file#%EF%B8%8F-keybindings) for details. ''; - extraOptions = { - yaziPackage = lib.mkPackageOption pkgs "yazi" { - nullable = true; - }; - }; + imports = [ + # TODO: added 2025-04-07, remove after 25.05 + (lib.nixvim.mkRemovedPackageOptionModule { + plugin = "yazi"; + packageName = "yazi"; + }) + ]; - extraConfig = cfg: { - extraPackages = [ cfg.yaziPackage ]; + extraConfig = { + dependencies.yazi.enable = lib.mkDefault true; }; settingsOptions = {