Fixing my earlier mistakes

1 files changed, 14 insertions, 11 deletions

diff --git a/modules/nickel.nix b/modules/nickel.nix
index 948dbaf..4d22c70 100644
--- a/modules/nickel.nix
+++ b/modules/nickel.nix
@@ -2,6 +2,7 @@
 with builtins // lib;
 let
   cfg = config.nickel;
+  importOption = p: (import p { inherit pkgs lib; } cfg.path).option;
   action = mkOption {
     type = types.enum [
       "cmd_spawn"
@@ -57,11 +58,13 @@ in {
       description = "Relative path to nickelMenu 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}";
+    # };
 
     menu = {
       item = mkOption {
@@ -133,11 +136,11 @@ in {
       ];
     };
 
-    file = mapAttrs' (n: v: {
-      name = "nm-${n}";
-      value = v // {
-        target = "${cfg.path}/${v.target}";
-      };
-    }) cfg.file
+    # file = mapAttrs' (n: v: {
+    #   name = "nm-${n}";
+    #   value = v // {
+    #     target = "${cfg.path}/${v.target}";
+    #   };
+    # }) cfg.file;
   };
 }