summaryrefslogtreecommitdiffstats
path: root/default.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-07-28 21:48:33 +0200
committerlassulus <lass@aidsballs.de>2015-07-28 21:48:33 +0200
commit12644fe303a6045d6d8ae75916cb601f95596f25 (patch)
tree05c118cffacead8bd127f23cf0144940de299686 /default.nix
parentac64527c5707cca5fc6e6e6ecf3957129cdb32b2 (diff)
parent5a03593b3a6eb97d2f369424b2631ad122b8de85 (diff)
Merge remote-tracking branch 'nomic/user-toplevel' into newmaster
Diffstat (limited to 'default.nix')
-rw-r--r--default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/default.nix b/default.nix
index 49e889924..77c5ead22 100644
--- a/default.nix
+++ b/default.nix
@@ -4,10 +4,10 @@ let
eval = import <nixpkgs/nixos/lib/eval-config.nix> {
system = builtins.currentSystem;
- modules = [
- (./1systems + "/${user-name}/${system-name}.nix")
- (./3modules/krebs)
- (./3modules + "/${user-name}")
+ modules = map (p: ./. + "/${p}") [
+ "${user-name}/systems/${system-name}.nix"
+ "${user-name}/modules"
+ "3modules/krebs"
];
};