diff --git a/modules/programs/yazi/default.nix b/modules/programs/yazi/default.nix index 692b72d..58e9354 100644 --- a/modules/programs/yazi/default.nix +++ b/modules/programs/yazi/default.nix @@ -37,13 +37,17 @@ description = "Additional keymap for yazi"; }; }; - config = lib.mkIf config.mods.yazi.enable ( - lib.optionalAttrs (options ? home.packages) { programs.yazi = import ./yazi.nix; } - // { - programs.yazi.settings = { - settings = config.mods.yazi.additionalKeymap; - keymap = config.mods.yazi.additionalConfig; - }; - } - ); + config = + let + conf = import ./yazi.nix; + in + lib.optionalAttrs (options ? home.packages) ( + lib.mkIf config.mods.yazi.enable { + programs.yazi = { + enable = conf.enable; + settings = conf.settings // config.mods.yazi.additionalKeymap; + keymap = conf.keymap // config.mods.yazi.additionalConfig; + }; + } + ); } diff --git a/modules/programs/yazi/yazi.nix b/modules/programs/yazi/yazi.nix index 236d422..92853d0 100644 --- a/modules/programs/yazi/yazi.nix +++ b/modules/programs/yazi/yazi.nix @@ -1,4 +1,3 @@ -{ lib, config, ... }: { # don't ask.... enable = true;