diff options
author | makefu <github@syntax-fehler.de> | 2015-07-28 21:56:10 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-07-28 21:56:10 +0200 |
commit | f7e206b608a2844c4e81173a673369402f8da06b (patch) | |
tree | 109f929d89dfa7a4a1b686019494b2355bcbc81f /default.nix | |
parent | fca517dd0e61c67d2a485f578e7146b46f048f69 (diff) | |
parent | 3228890813535514dfdfe9d049486a9e6054e479 (diff) |
Merge remote-tracking branch 'cd/user-toplevel' into user-toplevel
Diffstat (limited to 'default.nix')
-rw-r--r-- | default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/default.nix b/default.nix index b7468dbe7..0ee1c3d05 100644 --- a/default.nix +++ b/default.nix @@ -1,16 +1,12 @@ { user-name, system-name }: let - lib = import 4lib/krebs { - lib = import <nixpkgs/lib>; - }; eval = import <nixpkgs/nixos/lib/eval-config.nix> { - inherit lib; system = builtins.currentSystem; modules = map (p: ./. + "/${p}") [ - "${user-name}/systems/${system-name}.nix" - "${user-name}/modules" + "${user-name}/1systems/${system-name}.nix" + "${user-name}/3modules" "3modules/krebs" ]; }; |