diff --git a/lib/default.nix b/lib/default.nix index b7ce1e7..96752b6 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,5 +1,5 @@ lib: users: let configuration = import ./configuration.nix lib users; - merge = import ./merge.nix lib; + merge = import ./merge.nix; values = import ./values.nix; in configuration // merge // values diff --git a/lib/merge.nix b/lib/merge.nix index b76485a..e1b3f8f 100644 --- a/lib/merge.nix +++ b/lib/merge.nix @@ -1,4 +1,4 @@ -lib: let +let mergeAll = builtins.foldl' (collected: module: { imports = collected.imports ++ [ module ]; }) { imports = []; };