From 35b2ba75b6447ede03a0772f7cd3eeb8295177e9 Mon Sep 17 00:00:00 2001
From: DashieTM <fabio.lenherr@gmail.com>
Date: Sat, 9 Nov 2024 16:19:50 +0100
Subject: [PATCH] Fix yazi config

---
 modules/programs/yazi/default.nix | 22 +++++++++++++---------
 modules/programs/yazi/yazi.nix    |  1 -
 2 files changed, 13 insertions(+), 10 deletions(-)

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;