diff options
| author | lassulus <lass@aidsballs.de> | 2015-11-09 02:37:13 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-11-09 02:37:13 +0100 |
| commit | 3d7790601ef2b32bf6b72f829137fd18d9874fd3 (patch) | |
| tree | 02b5af9d30d27c5ddac360ae1fa13e0e20d5c20c /default.nix | |
| parent | 9ff1f770f6f3703fad34ef4ce2d24116d84a5665 (diff) | |
| parent | 610a3ce59c2ba0e58205305a85e9cb86e680d481 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'default.nix')
| -rw-r--r-- | default.nix | 5 |
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}; |