From f559b19bec61730c537cdd76233304e66c3f497a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 6 Nov 2015 22:05:36 +0100
Subject: [PATCH] stockholm: import default user config

---
 default.nix                           | 5 ++++-
 tv/1systems/cd.nix                    | 1 -
 tv/1systems/mkdir.nix                 | 1 -
 tv/1systems/nomic.nix                 | 1 -
 tv/1systems/rmdir.nix                 | 1 -
 tv/1systems/wu.nix                    | 1 -
 tv/1systems/xu.nix                    | 1 -
 tv/2configs/{base.nix => default.nix} | 0
 8 files changed, 4 insertions(+), 7 deletions(-)
 rename tv/2configs/{base.nix => default.nix} (100%)

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};
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 1122e6a19..3f496fefb 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -26,7 +26,6 @@ with lib;
   imports = [
     ../2configs/hw/CAC-Developer-2.nix
     ../2configs/fs/CAC-CentOS-7-64bit.nix
-    ../2configs/base.nix
     #../2configs/consul-server.nix
     ../2configs/exim-smarthost.nix
     ../2configs/git.nix
diff --git a/tv/1systems/mkdir.nix b/tv/1systems/mkdir.nix
index e8e354197..64896daf4 100644
--- a/tv/1systems/mkdir.nix
+++ b/tv/1systems/mkdir.nix
@@ -39,7 +39,6 @@ in
   imports = [
     ../2configs/hw/CAC-Developer-1.nix
     ../2configs/fs/CAC-CentOS-7-64bit.nix
-    ../2configs/base.nix
     ../2configs/consul-server.nix
     ../2configs/exim-smarthost.nix
     ../2configs/git.nix
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index df45b8177..495c765f3 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -25,7 +25,6 @@ with lib;
 
   imports = [
     ../2configs/hw/AO753.nix
-    ../2configs/base.nix
     #../2configs/consul-server.nix
     ../2configs/git.nix
     {
diff --git a/tv/1systems/rmdir.nix b/tv/1systems/rmdir.nix
index e24ef64fc..62340b88c 100644
--- a/tv/1systems/rmdir.nix
+++ b/tv/1systems/rmdir.nix
@@ -39,7 +39,6 @@ in
   imports = [
     ../2configs/hw/CAC-Developer-1.nix
     ../2configs/fs/CAC-CentOS-7-64bit.nix
-    ../2configs/base.nix
     ../2configs/consul-server.nix
     ../2configs/exim-smarthost.nix
     ../2configs/git.nix
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index fe6a5f303..8f714ec6b 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -27,7 +27,6 @@ with lib;
 
   imports = [
     ../2configs/hw/w110er.nix
-    ../2configs/base.nix
     #../2configs/consul-client.nix
     ../2configs/git.nix
     ../2configs/mail-client.nix
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index eb8c7c784..6f673ce9c 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -25,7 +25,6 @@ with lib;
 
   imports = [
     ../2configs/hw/x220.nix
-    ../2configs/base.nix
     #../2configs/consul-client.nix
     ../2configs/git.nix
     ../2configs/mail-client.nix
diff --git a/tv/2configs/base.nix b/tv/2configs/default.nix
similarity index 100%
rename from tv/2configs/base.nix
rename to tv/2configs/default.nix