Fixing my earlier mistakes

1 files changed, 8 insertions, 13 deletions

diff --git a/modules/kfmon.nix b/modules/kfmon.nix
index 772a10b..33f6a9c 100644
--- a/modules/kfmon.nix
+++ b/modules/kfmon.nix
@@ -2,6 +2,7 @@
 with builtins // lib;
 let
   cfg = config.kfmon;
+  importOption = p: (import p { inherit pkgs lib; } cfg.path).option;
 in {
   options.kfmon = {
     enable = mkEnableOption "KFMon";
@@ -12,19 +13,13 @@ in {
       description = "Relative path to kfmon within src";
     };
 
-    file = mkOption {
-      type = options.file.type;
-      default = {};
-      description = "Files relative to ${cfg.path}";
-    };
+    file = importOption ./lib/file.nix;
+    manifest = importOption ./lib/manifest.nix;
+    # file = mkOption {
+    #   type = options.file.type;
+    #   default = {};
+    #   description = "Files relative to ${cfg.path}";
+    # };
   };
 
-  config = mkIf cfg.enable {
-    file = mapAttrs' (n: v: {
-      name = "kfmon-${n}";
-      value = v // {
-        target = "${cfg.path}/${v.target}";
-      };
-    }) cfg.file
-  };
 }