2 files changed, 7 insertions, 3 deletions
diff --git a/modules/file-management/yazi/assertions.nix b/modules/file-management/yazi/assertions.nix
index 288757d..6435b00 100644
--- a/modules/file-management/yazi/assertions.nix
+++ b/modules/file-management/yazi/assertions.nix
@@ -1,16 +1,19 @@
 # Validates yazi dependencies and sub-options
 { config, ... }:
+let
+  cfg = config.file-management.yazi;
+in
 {
   assertions = [
     {
-      assertion = !config.file-management.yazi.enable || config.terminal.kitty.enable;
+      assertion = !cfg.enable || config.terminal.kitty.enable;
       message = ''
         file-management.yazi is enabled but terminal.kitty.enable is not.
         yazi's desktop entry requires kitty as the terminal launcher. Please enable terminal.kitty.
       '';
     }
     {
-      assertion = !config.file-management.yazi.file-chooser.enable || config.file-management.yazi.enable;
+      assertion = !cfg.file-chooser.enable || cfg.enable;
       message = "file-management.yazi.file-chooser.enable requires file-management.yazi.enable.";
     }
   ];
diff --git a/modules/file-management/yazi/theme.nix b/modules/file-management/yazi/theme.nix
index 6589200..f774ff2 100644
--- a/modules/file-management/yazi/theme.nix
+++ b/modules/file-management/yazi/theme.nix
@@ -6,10 +6,11 @@
   ...
 }:
 let
+  cfg = config.file-management.yazi;
   base16Colors = import ../../colors/base16 { inherit config lib pkgs; };
 in
 {
-  config = lib.mkIf config.file-management.yazi.enable {
+  config = lib.mkIf cfg.enable {
     programs.yazi.theme = with base16Colors.colorsWithHashPrefix; {
       manager = {
         cwd = {