summaryrefslogtreecommitdiffstats
path: root/default.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-11-06 22:38:44 +0100
committermakefu <github@syntax-fehler.de>2015-11-06 22:38:44 +0100
commit9a0e67cf65c5a827df7fca7573f47f3a43474df6 (patch)
tree72058c48138b25e5a0397d21d27ea4cb2a6cca2e /default.nix
parent736e1426d5a7ec76d0987840552d56c6b4f0248e (diff)
parent4d93a8215f08cbea0bbcb8c668f2bbc9600016da (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'default.nix')
-rw-r--r--default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/default.nix b/default.nix
index 472d7597d..ac748c286 100644
--- a/default.nix
+++ b/default.nix
@@ -32,7 +32,10 @@ let stockholm = {
upath = lib.nspath current-user-name;
base-module = { config, ... }: {
- imports = map (f: f "3modules") [ kpath upath ];
+ imports = builtins.filter builtins.pathExists (lib.concatLists [
+ (map (f: f "2configs") [ upath ])
+ (map (f: f "3modules") [ kpath upath ])
+ ]);
krebs.current.enable = true;
krebs.current.host = config.krebs.hosts.${current-host-name};