Merge remote-tracking branch 'ni/master'

110 files changed, 48 insertions, 33 deletions

diff --git a/krebs/3modules/external/dbalan.nix b/kartei/dbalan/default.nix
index 301f010d3..fadf187db 100644
--- a/krebs/3modules/external/dbalan.nix
+++ b/kartei/dbalan/default.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ../../lib;
 { config, ... }:
 let
   hostDefaults = hostName: host: flip recursiveUpdate host ({
diff --git a/kartei/default.nix b/kartei/default.nix
new file mode 100644
index 000000000..1b11f0fd5
--- /dev/null
+++ b/kartei/default.nix
@@ -0,0 +1,15 @@
+{ config, lib, ... }: {
+  config = lib.mkMerge (map (path: { krebs = import path { inherit config; }; }) [
+    ./dbalan
+    ./jeschli
+    ./kmein
+    ./krebs
+    ./lass
+    ./makefu
+    ./mic92
+    ./others
+    ./palo
+    ./rtunreal
+    ./tv
+  ]);
+}
diff --git a/krebs/3modules/jeschli/default.nix b/kartei/jeschli/default.nix
index 41743612a..fe12c16a4 100644
--- a/krebs/3modules/jeschli/default.nix
+++ b/kartei/jeschli/default.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ../../lib;
 { config, ... }: let
 
   hostDefaults = hostName: host: flip recursiveUpdate host ({
diff --git a/krebs/3modules/external/kmein.nix b/kartei/kmein/default.nix
index 09a95f02e..8e9e108e6 100644
--- a/krebs/3modules/external/kmein.nix
+++ b/kartei/kmein/default.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ../../lib;
 { config, ... }:
 let
   maybeEmpty = attrset: key: if (attrset?key) then attrset.${key} else [];
diff --git a/krebs/3modules/external/gpg/kmein.gpg b/kartei/kmein/kmein.gpg
index 1fa694326..1fa694326 100644
--- a/krebs/3modules/external/gpg/kmein.gpg
+++ b/kartei/kmein/kmein.gpg
diff --git a/krebs/3modules/external/ssh/kmein.kabsa.pub b/kartei/kmein/ssh/kmein.kabsa.pub
index a3cec5f8f..a3cec5f8f 100644
--- a/krebs/3modules/external/ssh/kmein.kabsa.pub
+++ b/kartei/kmein/ssh/kmein.kabsa.pub
diff --git a/krebs/3modules/external/ssh/kmein.manakish.pub b/kartei/kmein/ssh/kmein.manakish.pub
index 8be09d407..8be09d407 100644
--- a/krebs/3modules/external/ssh/kmein.manakish.pub
+++ b/kartei/kmein/ssh/kmein.manakish.pub
diff --git a/krebs/3modules/krebs/default.nix b/kartei/krebs/default.nix
index 854176f0b..b33a54f9a 100644
--- a/krebs/3modules/krebs/default.nix
+++ b/