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/kartei/krebs/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/lass/default.nix b/kartei/lass/default.nix
index ca0c757a3..0c314e9ec 100644
--- a/krebs/3modules/lass/default.nix
+++ b/kartei/lass/default.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ../../lib;
 { config, ... }: let
 
   r6 = ip: (krebs.genipv6 "retiolum" "lass" ip).address;
diff --git a/krebs/3modules/lass/pgp/mors.pgp b/kartei/lass/pgp/mors.pgp
index 6d985f0e2..6d985f0e2 100644
--- a/krebs/3modules/lass/pgp/mors.pgp
+++ b/kartei/lass/pgp/mors.pgp
diff --git a/krebs/3modules/lass/pgp/yubikey.pgp b/kartei/lass/pgp/yubikey.pgp
index be1054048..be1054048 100644
--- a/krebs/3modules/lass/pgp/yubikey.pgp
+++ b/kartei/lass/pgp/yubikey.pgp
diff --git a/krebs/3modules/lass/ssh/android.ed25519 b/kartei/lass/ssh/android.ed25519
index 44f424809..44f424809 100644
--- a/krebs/3modules/lass/ssh/android.ed25519
+++ b/kartei/lass/ssh/android.ed25519
diff --git a/krebs/3modules/lass/ssh/blue.rsa b/kartei/lass/ssh/blue.rsa
index c0bf9b817..c0bf9b817 100644
--- a/krebs/3modules/lass/ssh/blue.rsa
+++ b/kartei/lass/ssh/blue.rsa
diff --git a/krebs/3modules/lass/ssh/green.ed25519 b/kartei/lass/ssh/green.ed25519
index 1aa7b1801..1aa7b1801 100644
--- a/krebs/3modules/lass/ssh/green.ed25519
+++ b/kartei/lass/ssh/green.ed25519
diff --git a/krebs/3modules/lass/ssh/mors.rsa b/kartei/lass/ssh/mors.rsa
index 3aa18bcf9..3aa18bcf9 100644
--- a/krebs/3modules/lass/ssh/mors.rsa
+++ b/kartei/lass/ssh/mors.rsa
diff --git a/krebs/3modules/lass/ssh/tablet.ed25519 b/kartei/lass/ssh/tablet.ed25519
index 250be53f7..250be53f7 100644
--- a/krebs/3modules/lass/ssh/tablet.ed25519
+++ b/kartei/lass/ssh/tablet.ed25519
diff --git a/krebs/3modules/lass/ssh/yubikey.rsa b/kartei/lass/ssh/yubikey.rsa
index 349bb4aab..349bb4aab 100644
--- a/krebs/3modules/lass/ssh/yubikey.rsa
+++ b/kartei/lass/ssh/yubikey.rsa
diff --git a/krebs/3modules/makefu/default.nix b/kartei/makefu/default.nix
index 0d5359989..f9997b2d2 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/kartei/makefu/default.nix
@@ -2,7 +2,7 @@
 # tinc generate-keys
 # ssh-keygen -f ssh.id_ed25519 -t ed25519 -C host
 
-with import <stockholm/lib>;
+with import ../../lib;
 { config, ... }: let
 
   hostDefaults = hostName: host: foldl' recursiveUpdate {} [
diff --git a/krebs/3modules/makefu/pgp/brain.asc b/kartei/makefu/pgp/brain.asc
index 739385a38..739385a38 100644
--- a/krebs/3modules/makefu/pgp/brain.asc
+++ b/kartei/makefu/pgp/brain.asc
diff --git a/krebs/3modules/makefu/pgp/default.asc b/kartei/makefu/pgp/default.asc
index bc5c50b76..bc5c50b76 100644
--- a/krebs/3modules/makefu/pgp/default.asc
+++ b/kartei/makefu/pgp/default.asc
diff --git a/krebs/3modules/makefu/retiolum/cake.pub b/kartei/makefu/retiolum/cake.pub
index 8a1e4b933..8a1e4b933 100644
--- a/krebs/3modules/makefu/retiolum/cake.pub
+++ b/kartei/makefu/retiolum/cake.pub
diff --git a/krebs/3modules/makefu/retiolum/cake_ed25519.pub b/kartei/makefu/retiolum/cake_ed25519.pub
index 6c6bf2b33..6c6bf2b33 100644
--- a/krebs/3modules/makefu/retiolum/cake_ed25519.pub
+++ b/kartei/makefu/retiolum/cake_ed25519.pub
diff --git a/krebs/3modules/makefu/retiolum/crapi.pub b/kartei/makefu/retiolum/crapi.pub
index c66f24882..c66f24882 100644
--- a/krebs/3modules/makefu/retiolum/crapi.pub
+++ b/kartei/makefu/retiolum/crapi.pub
diff --git a/krebs/3modules/makefu/retiolum/crapi_ed25519.pub b/kartei/makefu/retiolum/crapi_ed25519.pub
index ce5a6f05a..ce5a6f05a 100644
--- a/krebs/3modules/makefu/retiolum/crapi_ed25519.pub
+++ b/kartei/makefu/retiolum/crapi_ed25519.pub
diff --git a/krebs/3modules/makefu/retiolum/fileleech.pub b/kartei/makefu/retiolum/fileleech.pub
index 1dc6a5b1f..1dc6a5b1f 100644
--- a/krebs/3modules/makefu/retiolum/fileleech.pub
+++ b/kartei/makefu/retiolum/fileleech.pub
diff --git a/krebs/3modules/makefu/retiolum/fileleech_ed25519.pub b/kartei/makefu/retiolum/fileleech_ed25519.pub
index ea93cfddb..ea93cfddb 100644
--- a/krebs/3modules/makefu/retiolum/fileleech_ed25519.pub
+++ b/kartei/makefu/retiolum/fileleech_ed25519.pub
diff --git a/krebs/3modules/makefu/retiolum/filepimp.pub b/kartei/makefu/retiolum/filepimp.pub
index 007806230..007806230 100644
--- a/krebs/3modules/makefu/retiolum/filepimp.pub
+++ b/kartei/makefu/retiolum/filepimp.pub
diff --git a/krebs/3modules/makefu/retiolum/filepimp_ed25519.pub b/kartei/makefu/retiolum/filepimp_ed25519.pub
index 7a62ff46f..7a62ff46f 100644
--- a/krebs/3modules/makefu/retiolum/filepimp_ed25519.pub
+++ b/kartei/makefu/retiolum/filepimp_ed25519.pub
diff --git a/krebs/3modules/makefu/retiolum/firecracker.pub b/kartei/makefu/retiolum/firecracker.pub
index 6f7907829..6f7907829 100644
--- a/krebs/3modules/makefu/retiolum/firecracker.pub
+++ b/kartei/makefu/retiolum/firecracker.pub
diff --git a/krebs/3modules/makefu/retiolum/firecracker_ed25519.pub b/kartei/makefu/retiolum/firecracker_ed25519.pub
index 76e6def7c..76e6def7c 100644
--- a/krebs/3modules/makefu/retiolum/firecracker_ed25519.pub
+++ b/kartei/makefu/retiolum/firecracker_ed25519.pub
diff --git a/krebs/3modules/makefu/retiolum/flap.pub b/kartei/makefu/retiolum/flap.pub
index 8906e659b..8906e659b 100644
--- a/krebs/3modules/makefu/retiolum/flap.pub
+++ b/kartei/makefu/retiolum/flap.pub
diff --git a/krebs/3modules/makefu/retiolum/flap_ed25519.pub b/kartei/makefu/retiolum/flap_ed25519.pub
index 47da38477..47da38477 100644
--- a/krebs/3modules/makefu/retiolum/flap_ed25519.pub
+++ b/kartei/makefu/retiolum/flap_ed25519.pub
diff --git a/krebs/3modules/makefu/retiolum/gum.pub b/kartei/makefu/retiolum/gum.pub
index 73f8563d0..73f8563d0 100644
--- a/krebs/3modules/makefu/retiolum/gum.pub
+++ b/kartei/makefu/retiolum/gum.pub
diff --git a/krebs/3modules/makefu/retiolum/gum_ed25519.pub b/kartei/makefu/retiolum/gum_ed25519.pub
index 5b6f2426e..5b6f2426e 100644
--- a/krebs/3modules/makefu/retiolum/gum_ed25519.pub
+++ b/kartei/makefu/retiolum/gum_ed25519.pub
diff --git a/krebs/3modules/makefu/retiolum/latte.pub b/kartei/makefu/retiolum/latte.pub
index 17fca2b40..17fca2b40 100644
--- a/krebs/3modules/makefu/retiolum/latte.pub
+++ b/kartei/makefu/retiolum/latte.pub
diff --git a/krebs/3modules/makefu/retiolum/latte_ed25519.pub b/kartei/makefu/retiolum/latte_ed25519.pub
index 7974bb6e5..7974bb6e5 100644
--- a/krebs/3modules/makefu/retiolum/latte_ed25519.pub
+++ b/kartei/makefu/retiolum/latte_ed25519.pub
diff --git a/krebs/3modules/makefu/retiolum/nukular.pub b/kartei/makefu/retiolum/nukular.pub
index eb5891b1b..eb5891b1b 100644
--- a/krebs/3modules/makefu/retiolum/nukular.pub
+++ b/kartei/makefu/retiolum/nukular.pub
diff --git a/krebs/3modules/makefu/retiolum/nukular_ed25519.pub b/kartei/makefu/retiolum/nukular_ed25519.pub
index 0cae03b83..0cae03b83 100644
--- a/krebs/3modules/makefu/retiolum/nukular_ed25519.pub
+++ b/kartei/makefu/retiolum/nukular_ed25519.pub
diff --git a/krebs/3modules/makefu/retiolum/omo.pub b/kartei/makefu/retiolum/omo.pub
index ce558d10a..ce558d10a 100644
--- a/krebs/3modules/makefu/retiolum/omo.pub
+++ b/kartei/makefu/retiolum/omo.pub
diff --git a/krebs/3modules/makefu/retiolum/omo_ed25519.pub b/kartei/makefu/retiolum/omo_ed25519.pub
index dd11ab7dd..dd11ab7dd 100644
--- a/krebs/3modules/makefu/retiolum/omo_ed25519.pub
+++ b/kartei/makefu/retiolum/omo_ed25519.pub
diff --git a/krebs/3modules/makefu/retiolum/sdev.pub b/kartei/makefu/retiolum/sdev.pub
index be500bbab..be500bbab 100644
--- a/krebs/3modules/makefu/retiolum/sdev.pub
+++ b/kartei/makefu/retiolum/sdev.pub
diff --git a/krebs/3modules/makefu/retiolum/sdev_ed25519.pub b/kartei/makefu/retiolum/sdev_ed25519.pub
index fef79aa68..fef79aa68 100644
--- a/krebs/3modules/makefu/retiolum/sdev_ed25519.pub
+++ b/kartei/makefu/retiolum/sdev_ed25519.pub
diff --git a/krebs/3modules/makefu/retiolum/senderechner.pub b/kartei/makefu/retiolum/senderechner.pub
index a6cbabc28..a6cbabc28 100644
--- a/krebs/3modules/makefu/retiolum/senderechner.pub
+++ b/kartei/makefu/retiolum/senderechner.pub
diff --git a/krebs/3modules/makefu/retiolum/senderechner_ed25519.pub b/kartei/makefu/retiolum/senderechner_ed25519.pub
index f0968aa12..f0968aa12 100644
--- a/krebs/3modules/makefu/retiolum/senderechner_ed25519.pub
+++ b/kartei/makefu/retiolum/senderechner_ed25519.pub
diff --git a/krebs/3modules/makefu/retiolum/studio.pub b/kartei/makefu/retiolum/studio.pub
index b8fe8ee23..b8fe8ee23 100644
--- a/krebs/3modules/makefu/retiolum/studio.pub
+++ b/kartei/makefu/retiolum/studio.pub
diff --git a/krebs/3modules/makefu/retiolum/studio_ed25519.pub b/kartei/makefu/retiolum/studio_ed25519.pub
index 13a09ad1b..13a09ad1b 100644
--- a/krebs/3modules/makefu/retiolum/studio_ed25519.pub
+++ b/kartei/makefu/retiolum/studio_ed25519.pub
diff --git a/krebs/3modules/makefu/retiolum/tsp.pub b/kartei/makefu/retiolum/tsp.pub
index 48533da58..48533da58 100644
--- a/krebs/3modules/makefu/retiolum/tsp.pub
+++ b/kartei/makefu/retiolum/tsp.pub
diff --git a/krebs/3modules/makefu/retiolum/tsp_ed25519.pub b/kartei/makefu/retiolum/tsp_ed25519.pub
index c7baf9067..c7baf9067 100644
--- a/krebs/3modules/makefu/retiolum/tsp_ed25519.pub
+++ b/kartei/makefu/retiolum/tsp_ed25519.pub
diff --git a/krebs/3modules/makefu/retiolum/vbob.pub b/kartei/makefu/retiolum/vbob.pub
index 168437e78..168437e78 100644
--- a/krebs/3modules/makefu/retiolum/vbob.pub
+++ b/kartei/makefu/retiolum/vbob.pub
diff --git a/krebs/3modules/makefu/retiolum/vbob_ed25519.pub b/kartei/makefu/retiolum/vbob_ed25519.pub
index 5e287f36b..5e287f36b 100644
--- a/krebs/3modules/makefu/retiolum/vbob_ed25519.pub
+++ b/kartei/makefu/retiolum/vbob_ed25519.pub
diff --git a/krebs/3modules/makefu/retiolum/wbob.pub b/kartei/makefu/retiolum/wbob.pub
index 8abfa34d4..8abfa34d4 100644
--- a/krebs/3modules/makefu/retiolum/wbob.pub
+++ b/kartei/makefu/retiolum/wbob.pub
diff --git a/krebs/3modules/makefu/retiolum/wbob_ed25519.pub b/kartei/makefu/retiolum/wbob_ed25519.pub
index eeef652e2..eeef652e2 100644
--- a/krebs/3modules/makefu/retiolum/wbob_ed25519.pub
+++ b/kartei/makefu/retiolum/wbob_ed25519.pub
diff --git a/krebs/3modules/makefu/retiolum/x.pub b/kartei/makefu/retiolum/x.pub
index da6482eed..da6482eed 100644
--- a/krebs/3modules/makefu/retiolum/x.pub
+++ b/kartei/makefu/retiolum/x.pub
diff --git a/krebs/3modules/makefu/retiolum/x_ed25519.pub b/kartei/makefu/retiolum/x_ed25519.pub
index fbf63d08e..fbf63d08e 100644
--- a/krebs/3modules/makefu/retiolum/x_ed25519.pub
+++ b/kartei/makefu/retiolum/x_ed25519.pub
diff --git a/krebs/3modules/makefu/ssh/makefu.android.pub b/kartei/makefu/ssh/makefu.android.pub
index 2bef2442a..2bef2442a 100644
--- a/krebs/3modules/makefu/ssh/makefu.android.pub
+++ b/kartei/makefu/ssh/makefu.android.pub
diff --git a/krebs/3modules/makefu/ssh/makefu.bob.pub b/kartei/makefu/ssh/makefu.bob.pub
index bc8718978..bc8718978 100644
--- a/krebs/3modules/makefu/ssh/makefu.bob.pub
+++ b/kartei/makefu/ssh/makefu.bob.pub
diff --git a/krebs/3modules/makefu/ssh/makefu.omo.pub b/kartei/makefu/ssh/makefu.omo.pub
index 5567040fb..5567040fb 100644
--- a/krebs/3modules/makefu/ssh/makefu.omo.pub
+++ b/kartei/makefu/ssh/makefu.omo.pub
diff --git a/krebs/3modules/makefu/ssh/makefu.remote-builder.pub b/kartei/makefu/ssh/makefu.remote-builder.pub
index ad49f380a..ad49f380a 100644
--- a/krebs/3modules/makefu/ssh/makefu.remote-builder.pub
+++ b/kartei/makefu/ssh/makefu.remote-builder.pub
diff --git a/krebs/3modules/makefu/ssh/makefu.tempx.pub b/kartei/makefu/ssh/makefu.tempx.pub
index 48d90040f..48d90040f 100644
--- a/krebs/3modules/makefu/ssh/makefu.tempx.pub
+++ b/kartei/makefu/ssh/makefu.tempx.pub
diff --git a/krebs/3modules/makefu/ssh/makefu.tsp.pub b/kartei/makefu/ssh/makefu.tsp.pub
index 9a9c9b6f8..9a9c9b6f8 100644
--- a/krebs/3modules/makefu/ssh/makefu.tsp.pub
+++ b/kartei/makefu/ssh/makefu.tsp.pub
diff --git a/krebs/3modules/makefu/ssh/makefu.vbob.pub b/kartei/makefu/ssh/makefu.vbob.pub
index c49714e24..c49714e24 100644
--- a/krebs/3modules/makefu/ssh/makefu.vbob.pub
+++ b/kartei/makefu/ssh/makefu.vbob.pub
diff --git a/krebs/3modules/makefu/ssh/makefu.x.pub b/kartei/makefu/ssh/makefu.x.pub
index 74b130f56..74b130f56 100644
--- a/krebs/3modules/makefu/ssh/makefu.x.pub
+++ b/kartei/makefu/ssh/makefu.x.pub
diff --git a/krebs/3modules/makefu/sshd/cake.pub b/kartei/makefu/sshd/cake.pub
index 8eab57ab7..8eab57ab7 100644
--- a/krebs/3modules/makefu/sshd/cake.pub
+++ b/kartei/makefu/sshd/cake.pub
diff --git a/krebs/3modules/makefu/sshd/crapi.pub b/kartei/makefu/sshd/crapi.pub
index 5361111a5..5361111a5 100644
--- a/krebs/3modules/makefu/sshd/crapi.pub
+++ b/kartei/makefu/sshd/crapi.pub
diff --git a/krebs/3modules/makefu/sshd/fileleech.pub b/kartei/makefu/sshd/fileleech.pub
index 22a3c7534..22a3c7534 100644
--- a/krebs/3modules/makefu/sshd/fileleech.pub
+++ b/kartei/makefu/sshd/fileleech.pub
diff --git a/krebs/3modules/makefu/sshd/firecracker.pub b/kartei/makefu/sshd/firecracker.pub
index 8e9ef5a37..8e9ef5a37 100644
--- a/krebs/3modules/makefu/sshd/firecracker.pub
+++ b/kartei/makefu/sshd/firecracker.pub
diff --git a/krebs/3modules/makefu/sshd/gum.pub b/kartei/makefu/sshd/gum.pub
index c79e3cbee..c79e3cbee 100644
--- a/krebs/3modules/makefu/sshd/gum.pub
+++ b/kartei/makefu/sshd/gum.pub
diff --git a/krebs/3modules/makefu/sshd/omo.pub b/kartei/makefu/sshd/omo.pub
index 5b9435414..5b9435414 100644
--- a/krebs/3modules/makefu/sshd/omo.pub
+++ b/kartei/makefu/sshd/omo.pub
diff --git a/krebs/3modules/makefu/sshd/sdev.pub b/kartei/makefu/sshd/sdev.pub
index 972e9b6d4..972e9b6d4 100644
--- a/krebs/3modules/makefu/sshd/sdev.pub
+++ b/kartei/makefu/sshd/sdev.pub
diff --git a/krebs/3modules/makefu/sshd/studio.pub b/kartei/makefu/sshd/studio.pub
index be5a4e6d3..be5a4e6d3 100644
--- a/krebs/3modules/makefu/sshd/studio.pub
+++ b/kartei/makefu/sshd/studio.pub
diff --git a/krebs/3modules/makefu/sshd/wbob.pub b/kartei/makefu/sshd/wbob.pub
index 8b1789f21..8b1789f21 100644
--- a/krebs/3modules/makefu/sshd/wbob.pub
+++ b/kartei/makefu/sshd/wbob.pub
diff --git a/krebs/3modules/makefu/sshd/x.pub b/kartei/makefu/sshd/x.pub
index 085f7f490..085f7f490 100644
--- a/krebs/3modules/makefu/sshd/x.pub
+++ b/kartei/makefu/sshd/x.pub
diff --git a/krebs/3modules/makefu/wiregrill/gum.pub b/kartei/makefu/wiregrill/gum.pub
index 67d6c7216..67d6c7216 100644
--- a/krebs/3modules/makefu/wiregrill/gum.pub
+++ b/kartei/makefu/wiregrill/gum.pub
diff --git a/krebs/3modules/makefu/wiregrill/rockit.pub b/kartei/makefu/wiregrill/rockit.pub
index ace109450..ace109450 100644
--- a/krebs/3modules/makefu/wiregrill/rockit.pub
+++ b/kartei/makefu/wiregrill/rockit.pub
diff --git a/krebs/3modules/makefu/wiregrill/shackdev.pub b/kartei/makefu/wiregrill/shackdev.pub
index 6cb0d960d..6cb0d960d 100644
--- a/krebs/3modules/makefu/wiregrill/shackdev.pub
+++ b/kartei/makefu/wiregrill/shackdev.pub
diff --git a/krebs/3modules/makefu/wiregrill/x.pub b/kartei/makefu/wiregrill/x.pub
index cfa9eb254..cfa9eb254 100644
--- a/krebs/3modules/makefu/wiregrill/x.pub
+++ b/kartei/makefu/wiregrill/x.pub
diff --git a/krebs/3modules/external/mic92.nix b/kartei/mic92/default.nix
index 2a3604b25..7c5c09c81 100644
--- a/krebs/3modules/external/mic92.nix
+++ b/kartei/mic92/default.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ../../lib;
 { config, ... }: let
   hostDefaults = hostName: host: flip recursiveUpdate host ({
     ci = false;
@@ -955,4 +955,10 @@ in {
       };
     };
   };
+  users = {
+    mic92 = {
+      mail = "joerg@thalheim.io";
+      pubkey = builtins.readFile ./ssh/mic92.pub;
+    };
+  };
 }
diff --git a/krebs/3modules/external/ssh/mic92.pub b/kartei/mic92/ssh/mic92.pub
index 600709c78..600709c78 100644
--- a/krebs/3modules/external/ssh/mic92.pub
+++ b/kartei/mic92/ssh/mic92.pub
diff --git a/krebs/3modules/external/default.nix b/kartei/others/default.nix
index 62cbb78a8..214880cb3 100644
--- a/krebs/3modules/external/default.nix
+++ b/kartei/others/default.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ../../lib;
 { config, ... }: let
 
   hostDefaults = hostName: host: flip recursiveUpdate host ({
@@ -816,10 +816,6 @@ in {
     jonge = {
       mail = "jacek.galowicz@gmail.com";
     };
-    mic92 = {
-      mail = "joerg@thalheim.io";
-      pubkey = ssh-for "mic92";
-    };
     pinpox = {
       mail = "main@pablo.tools";
     };
@@ -862,6 +858,7 @@ in {
       pubkey = ssh-for "xq";
     };
     xkey = {
+      mail = "xkey@krebsco.de";
       pubkey = ssh-for "xkey";
     };
     miaoski = {
diff --git a/krebs/3modules/external/ssh/0x4A6F.pub b/kartei/others/ssh/0x4A6F.pub
index 1ea084bad..1ea084bad 100644
--- a/krebs/3modules/external/ssh/0x4A6F.pub
+++ b/kartei/others/ssh/0x4A6F.pub
diff --git a/krebs/3modules/external/ssh/exco.pub b/kartei/others/ssh/exco.pub
index cab884c0c..cab884c0c 100644
--- a/krebs/3modules/external/ssh/exco.pub
+++ b/kartei/others/ssh/exco.pub
diff --git a/krebs/3modules/external/ssh/hase.pub b/kartei/others/ssh/hase.pub
index 02051a81f..02051a81f 100644
--- a/krebs/3modules/external/ssh/hase.pub
+++ b/kartei/others/ssh/hase.pub
diff --git a/krebs/3modules/external/ssh/neos.pub b/kartei/others/ssh/neos.pub
index 72065dab7..72065dab7 100644
--- a/krebs/3modules/external/ssh/neos.pub
+++ b/kartei/others/ssh/neos.pub
diff --git a/krebs/3modules/external/ssh/qubasa.pub b/kartei/others/ssh/qubasa.pub
index a8ab605d8..a8ab605d8 100644
--- a/krebs/3modules/external/ssh/qubasa.pub
+++ b/kartei/others/ssh/qubasa.pub
diff --git a/krebs/3modules/external/ssh/raute.pub b/kartei/others/ssh/raute.pub
index 69b4d3d10..69b4d3d10 100644
--- a/krebs/3modules/external/ssh/raute.pub
+++ b/kartei/others/ssh/raute.pub
diff --git a/krebs/3modules/external/ssh/rtjure.pub b/kartei/others/ssh/rtjure.pub
index 4c69e1836..4c69e1836 100644
--- a/krebs/3modules/external/ssh/rtjure.pub
+++ b/kartei/others/ssh/rtjure.pub
diff --git a/krebs/3modules/external/ssh/shannan.pub b/kartei/others/ssh/shannan.pub
index ed89d702a..ed89d702a 100644
--- a/krebs/3modules/external/ssh/shannan.pub
+++ b/kartei/others/ssh/shannan.pub
diff --git a/krebs/3modules/external/ssh/ulrich.pub b/kartei/others/ssh/ulrich.pub
index 8ac69004c..8ac69004c 100644
--- a/krebs/3modules/external/ssh/ulrich.pub
+++ b/kartei/others/ssh/ulrich.pub
diff --git a/krebs/3modules/external/ssh/xkey.pub b/kartei/others/ssh/xkey.pub
index cd09f06bb..cd09f06bb 100644
--- a/krebs/3modules/external/ssh/xkey.pub
+++ b/kartei/others/ssh/xkey.pub
diff --git a/krebs/3modules/external/ssh/xq.pub b/kartei/others/ssh/xq.pub
index 2c23970e3..2c23970e3 100644
--- a/krebs/3modules/external/ssh/xq.pub
+++ b/kartei/others/ssh/xq.pub
diff --git a/krebs/3modules/external/tinc/hasegateway.pub b/kartei/others/tinc/hasegateway.pub
index ef6520e85..ef6520e85 100644
--- a/krebs/3modules/external/tinc/hasegateway.pub
+++ b/kartei/others/tinc/hasegateway.pub
diff --git a/krebs/3modules/external/tinc/horisa.pub b/kartei/others/tinc/horisa.pub
index 06d686ce3..06d686ce3 100644
--- a/krebs/3modules/external/tinc/horisa.pub
+++ b/kartei/others/tinc/horisa.pub
diff --git a/krebs/3modules/external/tinc/justraute.pub b/kartei/others/tinc/justraute.pub
index b4af349b7..b4af349b7 100644
--- a/krebs/3modules/external/tinc/justraute.pub
+++ b/kartei/others/tinc/justraute.pub
diff --git a/krebs/3modules/external/tinc/tpsw.pub b/kartei/others/tinc/tpsw.pub
index 38b0cb293..38b0cb293 100644
--- a/krebs/3modules/external/tinc/tpsw.pub
+++ b/kartei/others/tinc/tpsw.pub
diff --git a/krebs/3modules/external/palo.nix b/kartei/palo/default.nix
index aea1792f4..4caf41f87 100644
--- a/krebs/3modules/external/palo.nix
+++ b/kartei/palo/default.nix
@@ -1,4 +1,4 @@
-with import <stockholm/lib>;
+with import ../../lib;
 { config, ... }: let
 
   hostDefaults = hostName: host: flip recursiveUpdate host ({
@@ -12,8 +12,6 @@ with import <stockholm/lib>;
     nets.wiregrill.ip6.addr =
       (krebs.genipv6 "wiregrill" "external" { inherit hostName; }).address;
   });
-  ssh-for = name: builtins.readFile (./ssh + "/${name}.pub");
-  tinc-for = name: builtins.readFile (./tinc + "/${name}.pub");
 
 in {
   hosts = mapAttrs hostDefaults {
@@ -24,7 +22,7 @@ in {
           ip4.addr = "10.243.23.1";
           tinc.port = 720;
           aliases = [ "pepe.r" ];
-          tinc.pubkey = tinc-for "palo";
+          tinc.pubkey = builtins.readFile ./retiolum.pub;
         };
       };
     };
@@ -35,7 +33,7 @@ in {
           ip4.addr = "10.243.23.2";
           tinc.port = 720;
           aliases = [ "schasch.r" ];
-          tinc.pubkey = tinc-for "palo";
+          tinc.pubkey = builtins.readFile ./retiolum.pub;
         };
       };
       syncthing.id = "FLY7DHI-TJLEQBJ-JZNC4YV-NBX53Z2-ZBRWADL-BKSFXYZ-L4FMDVH-MOSEVAQ";
@@ -49,7 +47,7 @@ in {
           aliases = [
             "sterni.r"
           ];
-          tinc.pubkey = tinc-for "palo";
+          tinc.pubkey = builtins.readFile ./retiolum.pub;
         };
       };
     };
@@ -60,7 +58,7 @@ in {
           ip4.addr = "10.243.23.5";
           tinc.port = 720;
           aliases = [ "workhorse.r" ];
-          tinc.pubkey = tinc-for "palo";
+          tinc.pubkey = builtins.readFile ./retiolum.pub;
         };
       };
     };
@@ -71,7 +69,7 @@ in {
           ip4.addr = "10.243.23.4";
           tinc.port = 720;
           aliases = [ "workout.r" ];
-          tinc.pubkey = tinc-for "palo";
+          tinc.pubkey = builtins.readFile ./retiolum.pub;
         };
       };
     };
diff --git a/krebs/3modules/external/tinc/palo.pub b/kartei/palo/retiolum.pub
index 65284d51d..65284d51d 100644
--- a/krebs/3modules/external/tinc/palo.pub
+++ b/kartei/palo/retiolum.pub
diff --git a/krebs/3modules/external/rtunreal.nix b/kartei/rtunreal/default.nix
index 8c0e0af2c..5f00e3d45 100644
--- a/krebs/3modules/external/rtunreal.nix
+++ b/kartei/rtunreal/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/tv/default.nix b/kartei/tv/default.nix
index 016d5ca9f..e6cfedb02 100644
--- a/krebs/3modules/tv/default.nix
+++ b/kartei/tv/default.nix
@@ -1,4 +1,4 @@
-with import ../../../lib;
+with import ../../lib;
 { config, ... }: let
 
   evalHost = hostName: hostConfig: evalSubmodule types.host [
diff --git a/krebs/3modules/tv/pgp/CBF89B0B.asc b/kartei/tv/pgp/CBF89B0B.asc
index e059116ae..e059116ae 100644
--- a/krebs/3modules/tv/pgp/CBF89B0B.asc
+++ b/kartei/tv/pgp/CBF89B0B.asc
diff --git a/krebs/3modules/tv/wiregrill/alnus.pub b/kartei/tv/wiregrill/alnus.pub
index de85e54da..de85e54da 100644
--- a/krebs/3modules/tv/wiregrill/alnus.pub
+++ b/kartei/tv/wiregrill/alnus.pub
diff --git a/krebs/3modules/tv/wiregrill/mu.pub b/kartei/tv/wiregrill/mu.pub
index 18edc8986..18edc8986 100644
--- a/krebs/3modules/tv/wiregrill/mu.pub
+++ b/kartei/tv/wiregrill/mu.pub
diff --git a/krebs/3modules/tv/wiregrill/ni.pub b/kartei/tv/wiregrill/ni.pub
index 257b29833..257b29833 100644
--- a/krebs/3modules/tv/wiregrill/ni.pub
+++ b/kartei/tv/wiregrill/ni.pub
diff --git a/krebs/3modules/tv/wiregrill/nomic.pub b/kartei/tv/wiregrill/nomic.pub
index be9c94be6..be9c94be6 100644
--- a/krebs/3modules/tv/wiregrill/nomic.pub
+++ b/kartei/tv/wiregrill/nomic.pub
diff --git a/krebs/3modules/tv/wiregrill/querel.pub b/kartei/tv/wiregrill/querel.pub
index 2273cf99d..2273cf99d 100644
--- a/krebs/3modules/tv/wiregrill/querel.pub
+++ b/kartei/tv/wiregrill/querel.pub
diff --git a/krebs/3modules/tv/wiregrill/umz.pub b/kartei/tv/wiregrill/umz.pub
index c041b5eee..c041b5eee 100644
--- a/krebs/3modules/tv/wiregrill/umz.pub
+++ b/kartei/tv/wiregrill/umz.pub
diff --git a/krebs/3modules/tv/wiregrill/wu.pub b/kartei/tv/wiregrill/wu.pub
index 0d25d9de9..0d25d9de9 100644
--- a/krebs/3modules/tv/wiregrill/wu.pub
+++ b/kartei/tv/wiregrill/wu.pub
diff --git a/krebs/3modules/tv/wiregrill/xu.pub b/kartei/tv/wiregrill/xu.pub
index ba0c7dd04..ba0c7dd04 100644
--- a/krebs/3modules/tv/wiregrill/xu.pub
+++ b/kartei/tv/wiregrill/xu.pub
diff --git a/krebs/3modules/tv/wiregrill/zu.pub b/kartei/tv/wiregrill/zu.pub
index 0238dd653..0238dd653 100644
--- a/krebs/3modules/tv/wiregrill/zu.pub
+++ b/kartei/tv/wiregrill/zu.pub
diff --git a/krebs/2configs/exim-smarthost.nix b/krebs/2configs/exim-smarthost.nix
index 82f8ec942..01597f49f 100644
--- a/krebs/2configs/exim-smarthost.nix
+++ b/krebs/2configs/exim-smarthost.nix
@@ -16,6 +16,14 @@ in {
         tv
       ];
       eloop-ml = spam-ml;
+      krebstel-ml = [
+        config.krebs.users."0x4A6F"
+        { mail = "krebstel-1rxz0mqa95nkmk298s1731ly0ii7vc36kkm36pnjj89hrq52pgn1@ni.r"; }
+        { mail = "krebstel-1difh7483axpiaq92ghi14r5cql822wbhixqb0nn3y3jkcj0b785@ni.r"; }
+        { mail = "lass@green.r"; }
+        tv
+        xkey
+      ];
       spam-ml = [
         lass
         makefu
@@ -28,6 +36,7 @@ in {
       "spam@eloop.org" = eloop-ml;
       "youtube@eloop.org" = eloop-ml; # obsolete, use spam@eloop.org instead
       "postmaster@krebsco.de" = spam-ml; # RFC 822
+      "krebstel@krebsco.de" = krebstel-ml;
       "lass@krebsco.de" = lass;
       "makefu@krebsco.de" = makefu;
       "spam@krebsco.de" = spam-ml;
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 7af6b13d9..70fc05813 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -6,6 +6,7 @@ let
 
   out = {
     imports = [
+      ../../kartei
       ./acl.nix
       ./airdcpp.nix
       ./announce-activation.nix
@@ -100,17 +101,6 @@ let
   };
 
   imp = lib.mkMerge [
-    { krebs = import ./external { inherit config; }; }
-    { krebs = import ./external/dbalan.nix { inherit config; }; }
-    { krebs = import ./external/kmein.nix { inherit config; }; }
-    { krebs = import ./external/mic92.nix { inherit config; }; }
-    { krebs = import ./external/palo.nix { inherit config; }; }
-    { krebs = import ./external/rtunreal.nix { inherit config; }; }
-    { krebs = import ./jeschli { inherit config; }; }
-    { krebs = import ./krebs  { inherit config; }; }
-    { krebs = import ./lass   { inherit config; }; }
-    { krebs = import ./makefu { inherit config; }; }
-    { krebs = import ./tv     { inherit config; }; }
     {
       krebs.dns.providers = {
         "krebsco.de" = "zones";