I am blind as a bat...

This commit is contained in:
Chris Kruining 2024-07-22 12:42:39 +02:00
parent 23485c3c73
commit 63c2f9863d
3 changed files with 4 additions and 4 deletions

View file

@ -15,7 +15,7 @@ let
}; };
}; };
mylib = makeExensible (self: mylib = makeExtensible (self:
mapModules ./. (file: import file { inherit self lib pkgs inputs; }) mapModules ./. (file: import file { inherit self lib pkgs inputs; })
); );
in in

View file

@ -30,7 +30,7 @@ in rec
mapModulesRec' = dir: fn: let mapModulesRec' = dir: fn: let
dirs = mapAttrsToList (k: _: "${dir}/${k}") (filterAttrs (n: v: v == "directory" && !(hasPrefix "_" n)) (readDir dir)); dirs = mapAttrsToList (k: _: "${dir}/${k}") (filterAttrs (n: v: v == "directory" && !(hasPrefix "_" n)) (readDir dir));
files = attrValues (mapModules dir id); files = attrValues (mapModules dir id);
paths = files ++ contactLists (map (d: mapModulesRec' d id) dirs); paths = files ++ concatLists (map (d: mapModulesRec' d id) dirs);
in in
map fn paths; map fn paths;
} }

View file

@ -8,11 +8,11 @@ let
inherit (self.modules) mapModules; inherit (self.modules) mapModules;
in rec in rec
{ {
mkHost = path: attrs @ {sytem ? "x86_64-linux", ...}: mkHost = path: attrs @ {system ? "x86_64-linux", ...}:
nixosSystem { nixosSystem {
inherit system; inherit system;
specialArgs = { inherit lib input system; }; specialArgs = { inherit lib inputs system; };
modules = [ modules = [
{ {