summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-11-23 18:41:11 +0100
committerlassulus <lassulus@lassul.us>2022-11-23 18:41:11 +0100
commitc345613cf0868c7835821f395aacdc0d135557c7 (patch)
tree5169e9d2920f1623e2c7cbb50a9ad5e44d52519a
parent82f774d59d054af79926660ec631529aa26b9bcd (diff)
parent606f88e4f0a8c257f9e6be94ca8469da04b381cc (diff)
Merge remote-tracking branch 'ni/master'
-rw-r--r--kartei/dbalan/default.nix (renamed from krebs/3modules/external/dbalan.nix)2
-rw-r--r--kartei/default.nix15
-rw-r--r--kartei/jeschli/default.nix (renamed from krebs/3modules/jeschli/default.nix)2
-rw-r--r--kartei/kmein/default.nix (renamed from krebs/3modules/external/kmein.nix)2
-rw-r--r--kartei/kmein/kmein.gpg (renamed from krebs/3modules/external/gpg/kmein.gpg)0
-rw-r--r--kartei/kmein/ssh/kmein.kabsa.pub (renamed from krebs/3modules/external/ssh/kmein.kabsa.pub)0
-rw-r--r--kartei/kmein/ssh/kmein.manakish.pub (renamed from krebs/3modules/external/ssh/kmein.manakish.pub)0
-rw-r--r--kartei/krebs/default.nix (renamed from krebs/3modules/krebs/default.nix)2
-rw-r--r--kartei/lass/default.nix (renamed from krebs/3modules/lass/default.nix)2
-rw-r--r--kartei/lass/pgp/mors.pgp (renamed from krebs/3modules/lass/pgp/mors.pgp)0
-rw-r--r--kartei/lass/pgp/yubikey.pgp (renamed from krebs/3modules/lass/pgp/yubikey.pgp)0
-rw-r--r--kartei/lass/ssh/android.ed25519 (renamed from krebs/3modules/lass/ssh/android.ed25519)0
-rw-r--r--kartei/lass/ssh/blue.rsa (renamed from krebs/3modules/lass/ssh/blue.rsa)0
-rw-r--r--kartei/lass/ssh/green.ed25519 (renamed from krebs/3modules/lass/ssh/green.ed25519)0
-rw-r--r--kartei/lass/ssh/mors.rsa (renamed from krebs/3modules/lass/ssh/mors.rsa)0
-rw-r--r--kartei/lass/ssh/tablet.ed25519 (renamed from krebs/3modules/lass/ssh/tablet.ed25519)0
-rw-r--r--kartei/lass/ssh/yubikey.rsa (renamed from krebs/3modules/lass/ssh/yubikey.rsa)0
-rw-r--r--kartei/makefu/default.nix (renamed from krebs/3modules/makefu/default.nix)2
-rw-r--r--kartei/makefu/pgp/brain.asc (renamed from krebs/3modules/makefu/pgp/brain.asc)0
-rw-r--r--kartei/makefu/pgp/default.asc (renamed from krebs/3modules/makefu/pgp/default.asc)0
-rw-r--r--kartei/makefu/retiolum/cake.pub (renamed from krebs/3modules/makefu/retiolum/cake.pub)0
-rw-r--r--kartei/makefu/retiolum/cake_ed25519.pub (renamed from krebs/3modules/makefu/retiolum/cake_ed25519.pub)0
-rw-r--r--kartei/makefu/retiolum/crapi.pub (renamed from krebs/3modules/makefu/retiolum/crapi.pub)0
-rw-r--r--kartei/makefu/retiolum/crapi_ed25519.pub (renamed from krebs/3modules/makefu/retiolum/crapi_ed25519.pub)0
-rw-r--r--kartei/makefu/retiolum/fileleech.pub (renamed from krebs/3modules/makefu/retiolum/fileleech.pub)0
-rw-r--r--kartei/makefu/retiolum/fileleech_ed25519.pub (renamed from krebs/3modules/makefu/retiolum/fileleech_ed25519.pub)0
-rw-r--r--kartei/makefu/retiolum/filepimp.pub (renamed from krebs/3modules/makefu/retiolum/filepimp.pub)0
-rw-r--r--kartei/makefu/retiolum/filepimp_ed25519.pub (renamed from krebs/3modules/makefu/retiolum/filepimp_ed25519.pub)0
-rw-r--r--kartei/makefu/retiolum/firecracker.pub (renamed from krebs/3modules/makefu/retiolum/firecracker.pub)0
-rw-r--r--kartei/makefu/retiolum/firecracker_ed25519.pub (renamed from krebs/3modules/makefu/retiolum/firecracker_ed25519.pub)0
-rw-r--r--kartei/makefu/retiolum/flap.pub (renamed from krebs/3modules/makefu/retiolum/flap.pub)0
-rw-r--r--kartei/makefu/retiolum/flap_ed25519.pub (renamed from krebs/3modules/makefu/retiolum/flap_ed25519.pub)0
-rw-r--r--kartei/makefu/retiolum/gum.pub (renamed from krebs/3modules/makefu/retiolum/gum.pub)0
-rw-r--r--kartei/makefu/retiolum/gum_ed25519.pub (renamed from krebs/3modules/makefu/retiolum/gum_ed25519.pub)0
-rw-r--r--kartei/makefu/retiolum/latte.pub (renamed from krebs/3modules/makefu/retiolum/latte.pub)0
-rw-r--r--kartei/makefu/retiolum/latte_ed25519.pub (renamed from krebs/3modules/makefu/retiolum/latte_ed25519.pub)0
-rw-r--r--kartei/makefu/retiolum/nukular.pub (renamed from krebs/3modules/makefu/retiolum/nukular.pub)0
-rw-r--r--kartei/makefu/retiolum/nukular_ed25519.pub (renamed from krebs/3modules/makefu/retiolum/nukular_ed25519.pub)0
-rw-r--r--kartei/makefu/retiolum/omo.pub (renamed from krebs/3modules/makefu/retiolum/omo.pub)0
-rw-r--r--kartei/makefu/retiolum/omo_ed25519.pub (renamed from krebs/3modules/makefu/retiolum/omo_ed25519.pub)0
-rw-r--r--kartei/makefu/retiolum/sdev.pub (renamed from krebs/3modules/makefu/retiolum/sdev.pub)0
-rw-r--r--kartei/makefu/retiolum/sdev_ed25519.pub (renamed from krebs/3modules/makefu/retiolum/sdev_ed25519.pub)0
-rw-r--r--kartei/makefu/retiolum/senderechner.pub (renamed from krebs/3modules/makefu/retiolum/senderechner.pub)0
-rw-r--r--kartei/makefu/retiolum/senderechner_ed25519.pub (renamed from krebs/3modules/makefu/retiolum/senderechner_ed25519.pub)0
-rw-r--r--kartei/makefu/retiolum/studio.pub (renamed from krebs/3modules/makefu/retiolum/studio.pub)0
-rw-r--r--kartei/makefu/retiolum/studio_ed25519.pub (renamed from krebs/3modules/makefu/retiolum/studio_ed25519.pub)0
-rw-r--r--kartei/makefu/retiolum/tsp.pub (renamed from krebs/3modules/makefu/retiolum/tsp.pub)0
-rw-r--r--kartei/makefu/retiolum/tsp_ed25519.pub (renamed from krebs/3modules/makefu/retiolum/tsp_ed25519.pub)0
-rw-r--r--kartei/makefu/retiolum/vbob.pub (renamed from krebs/3modules/makefu/retiolum/vbob.pub)0
-rw-r--r--kartei/makefu/retiolum/vbob_ed25519.pub (renamed from krebs/3modules/makefu/retiolum/vbob_ed25519.pub)0
-rw-r--r--kartei/makefu/retiolum/wbob.pub (renamed from krebs/3modules/makefu/retiolum/wbob.pub)0
-rw-r--r--kartei/makefu/retiolum/wbob_ed25519.pub (renamed from krebs/3modules/makefu/retiolum/wbob_ed25519.pub)0
-rw-r--r--kartei/makefu/retiolum/x.pub (renamed from krebs/3modules/makefu/retiolum/x.pub)0
-rw-r--r--kartei/makefu/retiolum/x_ed25519.pub (renamed from krebs/3modules/makefu/retiolum/x_ed25519.pub)0
-rw-r--r--kartei/makefu/ssh/makefu.android.pub (renamed from krebs/3modules/makefu/ssh/makefu.android.pub)0
-rw-r--r--kartei/makefu/ssh/makefu.bob.pub (renamed from krebs/3modules/makefu/ssh/makefu.bob.pub)0
-rw-r--r--kartei/makefu/ssh/makefu.omo.pub (renamed from krebs/3modules/makefu/ssh/makefu.omo.pub)0
-rw-r--r--kartei/makefu/ssh/makefu.remote-builder.pub (renamed from krebs/3modules/makefu/ssh/makefu.remote-builder.pub)0
-rw-r--r--kartei/makefu/ssh/makefu.tempx.pub (renamed from krebs/3modules/makefu/ssh/makefu.tempx.pub)0
-rw-r--r--kartei/makefu/ssh/makefu.tsp.pub (renamed from krebs/3modules/makefu/ssh/makefu.tsp.pub)0
-rw-r--r--kartei/makefu/ssh/makefu.vbob.pub (renamed from krebs/3modules/makefu/ssh/makefu.vbob.pub)0
-rw-r--r--kartei/makefu/ssh/makefu.x.pub (renamed from krebs/3modules/makefu/ssh/makefu.x.pub)0
-rw-r--r--kartei/makefu/sshd/cake.pub (renamed from krebs/3modules/makefu/sshd/cake.pub)0
-rw-r--r--kartei/makefu/sshd/crapi.pub (renamed from krebs/3modules/makefu/sshd/crapi.pub)0
-rw-r--r--kartei/makefu/sshd/fileleech.pub (renamed from krebs/3modules/makefu/sshd/fileleech.pub)0
-rw-r--r--kartei/makefu/sshd/firecracker.pub (renamed from krebs/3modules/makefu/sshd/firecracker.pub)0
-rw-r--r--kartei/makefu/sshd/gum.pub (renamed from krebs/3modules/makefu/sshd/gum.pub)0
-rw-r--r--kartei/makefu/sshd/omo.pub (renamed from krebs/3modules/makefu/sshd/omo.pub)0
-rw-r--r--kartei/makefu/sshd/sdev.pub (renamed from krebs/3modules/makefu/sshd/sdev.pub)0
-rw-r--r--kartei/makefu/sshd/studio.pub (renamed from krebs/3modules/makefu/sshd/studio.pub)0
-rw-r--r--kartei/makefu/sshd/wbob.pub (renamed from krebs/3modules/makefu/sshd/wbob.pub)0
-rw-r--r--kartei/makefu/sshd/x.pub (renamed from krebs/3modules/makefu/sshd/x.pub)0
-rw-r--r--kartei/makefu/wiregrill/gum.pub (renamed from krebs/3modules/makefu/wiregrill/gum.pub)0
-rw-r--r--kartei/makefu/wiregrill/rockit.pub (renamed from krebs/3modules/makefu/wiregrill/rockit.pub)0
-rw-r--r--kartei/makefu/wiregrill/shackdev.pub (renamed from krebs/3modules/makefu/wiregrill/shackdev.pub)0
-rw-r--r--kartei/makefu/wiregrill/x.pub (renamed from krebs/3modules/makefu/wiregrill/x.pub)0
-rw-r--r--kartei/mic92/default.nix (renamed from krebs/3modules/external/mic92.nix)8
-rw-r--r--kartei/mic92/ssh/mic92.pub (renamed from krebs/3modules/external/ssh/mic92.pub)0
-rw-r--r--kartei/others/default.nix (renamed from krebs/3modules/external/default.nix)7
-rw-r--r--kartei/others/ssh/0x4A6F.pub (renamed from krebs/3modules/external/ssh/0x4A6F.pub)0
-rw-r--r--kartei/others/ssh/exco.pub (renamed from krebs/3modules/external/ssh/exco.pub)0
-rw-r--r--kartei/others/ssh/hase.pub (renamed from krebs/3modules/external/ssh/hase.pub)0
-rw-r--r--kartei/others/ssh/neos.pub (renamed from krebs/3modules/external/ssh/neos.pub)0
-rw-r--r--kartei/others/ssh/qubasa.pub (renamed from krebs/3modules/external/ssh/qubasa.pub)0
-rw-r--r--kartei/others/ssh/raute.pub (renamed from krebs/3modules/external/ssh/raute.pub)0
-rw-r--r--kartei/others/ssh/rtjure.pub (renamed from krebs/3modules/external/ssh/rtjure.pub)0
-rw-r--r--kartei/others/ssh/shannan.pub (renamed from krebs/3modules/external/ssh/shannan.pub)0
-rw-r--r--kartei/others/ssh/ulrich.pub (renamed from krebs/3modules/external/ssh/ulrich.pub)0
-rw-r--r--kartei/others/ssh/xkey.pub (renamed from krebs/3modules/external/ssh/xkey.pub)0
-rw-r--r--kartei/others/ssh/xq.pub (renamed from krebs/3modules/external/ssh/xq.pub)0
-rw-r--r--kartei/others/tinc/hasegateway.pub (renamed from krebs/3modules/external/tinc/hasegateway.pub)0
-rw-r--r--kartei/others/tinc/horisa.pub (renamed from krebs/3modules/external/tinc/horisa.pub)0
-rw-r--r--kartei/others/tinc/justraute.pub (renamed from krebs/3modules/external/tinc/justraute.pub)0
-rw-r--r--kartei/others/tinc/tpsw.pub (renamed from krebs/3modules/external/tinc/tpsw.pub)0
-rw-r--r--kartei/palo/default.nix (renamed from krebs/3modules/external/palo.nix)14
-rw-r--r--kartei/palo/retiolum.pub (renamed from krebs/3modules/external/tinc/palo.pub)0
-rw-r--r--kartei/rtunreal/default.nix (renamed from krebs/3modules/external/rtunreal.nix)2
-rw-r--r--kartei/tv/default.nix (renamed from krebs/3modules/tv/default.nix)2
-rw-r--r--kartei/tv/pgp/CBF89B0B.asc (renamed from krebs/3modules/tv/pgp/CBF89B0B.asc)0
-rw-r--r--kartei/tv/wiregrill/alnus.pub (renamed from krebs/3modules/tv/wiregrill/alnus.pub)0
-rw-r--r--kartei/tv/wiregrill/mu.pub (renamed from krebs/3modules/tv/wiregrill/mu.pub)0
-rw-r--r--kartei/tv/wiregrill/ni.pub (renamed from krebs/3modules/tv/wiregrill/ni.pub)0
-rw-r--r--kartei/tv/wiregrill/nomic.pub (renamed from krebs/3modules/tv/wiregrill/nomic.pub)0
-rw-r--r--kartei/tv/wiregrill/querel.pub (renamed from krebs/3modules/tv/wiregrill/querel.pub)0
-rw-r--r--kartei/tv/wiregrill/umz.pub (renamed from krebs/3modules/tv/wiregrill/umz.pub)0
-rw-r--r--kartei/tv/wiregrill/wu.pub (renamed from krebs/3modules/tv/wiregrill/wu.pub)0
-rw-r--r--kartei/tv/wiregrill/xu.pub (renamed from krebs/3modules/tv/wiregrill/xu.pub)0
-rw-r--r--kartei/tv/wiregrill/zu.pub (renamed from krebs/3modules/tv/wiregrill/zu.pub)0
-rw-r--r--krebs/2configs/exim-smarthost.nix9
-rw-r--r--krebs/3modules/default.nix12
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/