diff --git a/lib/default.nix b/lib/default.nix index 249c76c..38cfde6 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -15,7 +15,7 @@ let }; }; - mylib = makeExensible (self: + mylib = makeExtensible (self: mapModules ./. (file: import file { inherit self lib pkgs inputs; }) ); in diff --git a/lib/modules.nix b/lib/modules.nix index 06ed5e4..59bff3f 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -30,7 +30,7 @@ in rec mapModulesRec' = dir: fn: let dirs = mapAttrsToList (k: _: "${dir}/${k}") (filterAttrs (n: v: v == "directory" && !(hasPrefix "_" n)) (readDir dir)); files = attrValues (mapModules dir id); - paths = files ++ contactLists (map (d: mapModulesRec' d id) dirs); + paths = files ++ concatLists (map (d: mapModulesRec' d id) dirs); in map fn paths; } diff --git a/lib/nixos.nix b/lib/nixos.nix index a119c34..faf9194 100644 --- a/lib/nixos.nix +++ b/lib/nixos.nix @@ -8,11 +8,11 @@ let inherit (self.modules) mapModules; in rec { - mkHost = path: attrs @ {sytem ? "x86_64-linux", ...}: + mkHost = path: attrs @ {system ? "x86_64-linux", ...}: nixosSystem { inherit system; - specialArgs = { inherit lib input system; }; + specialArgs = { inherit lib inputs system; }; modules = [ {