diff --git a/krebs/3modules/external/dbalan.nix b/kartei/dbalan/default.nix similarity index 98% rename from krebs/3modules/external/dbalan.nix rename to 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 ; +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 similarity index 99% rename from krebs/3modules/jeschli/default.nix rename to 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 ; +with import ../../lib; { config, ... }: let hostDefaults = hostName: host: flip recursiveUpdate host ({ diff --git a/krebs/3modules/external/kmein.nix b/kartei/kmein/default.nix similarity index 99% rename from krebs/3modules/external/kmein.nix rename to 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 ; +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 similarity index 100% rename from krebs/3modules/external/gpg/kmein.gpg rename to kartei/kmein/kmein.gpg diff --git a/krebs/3modules/external/ssh/kmein.kabsa.pub b/kartei/kmein/ssh/kmein.kabsa.pub similarity index 100% rename from krebs/3modules/external/ssh/kmein.kabsa.pub rename to kartei/kmein/ssh/kmein.kabsa.pub diff --git a/krebs/3modules/external/ssh/kmein.manakish.pub b/kartei/kmein/ssh/kmein.manakish.pub similarity index 100% rename from krebs/3modules/external/ssh/kmein.manakish.pub rename to kartei/kmein/ssh/kmein.manakish.pub diff --git a/krebs/3modules/krebs/default.nix b/kartei/krebs/default.nix similarity index 99% rename from krebs/3modules/krebs/default.nix rename to 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 ; +with import ../../lib; { config, ... }: let hostDefaults = hostName: host: flip recursiveUpdate host ({ diff --git a/krebs/3modules/lass/default.nix b/kartei/lass/default.nix similarity index 99% rename from krebs/3modules/lass/default.nix rename to 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 ; +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 similarity index 100% rename from krebs/3modules/lass/pgp/mors.pgp rename to kartei/lass/pgp/mors.pgp diff --git a/krebs/3modules/lass/pgp/yubikey.pgp b/kartei/lass/pgp/yubikey.pgp similarity index 100% rename from krebs/3modules/lass/pgp/yubikey.pgp rename to kartei/lass/pgp/yubikey.pgp diff --git a/krebs/3modules/lass/ssh/android.ed25519 b/kartei/lass/ssh/android.ed25519 similarity index 100% rename from krebs/3modules/lass/ssh/android.ed25519 rename to kartei/lass/ssh/android.ed25519 diff --git a/krebs/3modules/lass/ssh/blue.rsa b/kartei/lass/ssh/blue.rsa similarity index 100% rename from krebs/3modules/lass/ssh/blue.rsa rename to kartei/lass/ssh/blue.rsa diff --git a/krebs/3modules/lass/ssh/green.ed25519 b/kartei/lass/ssh/green.ed25519 similarity index 100% rename from krebs/3modules/lass/ssh/green.ed25519 rename to kartei/lass/ssh/green.ed25519 diff --git a/krebs/3modules/lass/ssh/mors.rsa b/kartei/lass/ssh/mors.rsa similarity index 100% rename from krebs/3modules/lass/ssh/mors.rsa rename to kartei/lass/ssh/mors.rsa diff --git a/krebs/3modules/lass/ssh/tablet.ed25519 b/kartei/lass/ssh/tablet.ed25519 similarity index 100% rename from krebs/3modules/lass/ssh/tablet.ed25519 rename to kartei/lass/ssh/tablet.ed25519 diff --git a/krebs/3modules/lass/ssh/yubikey.rsa b/kartei/lass/ssh/yubikey.rsa similarity index 100% rename from krebs/3modules/lass/ssh/yubikey.rsa rename to kartei/lass/ssh/yubikey.rsa diff --git a/krebs/3modules/makefu/default.nix b/kartei/makefu/default.nix similarity index 99% rename from krebs/3modules/makefu/default.nix rename to 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 ; +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 similarity index 100% rename from krebs/3modules/makefu/pgp/brain.asc rename to kartei/makefu/pgp/brain.asc diff --git a/krebs/3modules/makefu/pgp/default.asc b/kartei/makefu/pgp/default.asc similarity index 100% rename from krebs/3modules/makefu/pgp/default.asc rename to kartei/makefu/pgp/default.asc diff --git a/krebs/3modules/makefu/retiolum/cake.pub b/kartei/makefu/retiolum/cake.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/cake.pub rename to kartei/makefu/retiolum/cake.pub diff --git a/krebs/3modules/makefu/retiolum/cake_ed25519.pub b/kartei/makefu/retiolum/cake_ed25519.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/cake_ed25519.pub rename to kartei/makefu/retiolum/cake_ed25519.pub diff --git a/krebs/3modules/makefu/retiolum/crapi.pub b/kartei/makefu/retiolum/crapi.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/crapi.pub rename to kartei/makefu/retiolum/crapi.pub diff --git a/krebs/3modules/makefu/retiolum/crapi_ed25519.pub b/kartei/makefu/retiolum/crapi_ed25519.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/crapi_ed25519.pub rename to kartei/makefu/retiolum/crapi_ed25519.pub diff --git a/krebs/3modules/makefu/retiolum/fileleech.pub b/kartei/makefu/retiolum/fileleech.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/fileleech.pub rename to kartei/makefu/retiolum/fileleech.pub diff --git a/krebs/3modules/makefu/retiolum/fileleech_ed25519.pub b/kartei/makefu/retiolum/fileleech_ed25519.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/fileleech_ed25519.pub rename to kartei/makefu/retiolum/fileleech_ed25519.pub diff --git a/krebs/3modules/makefu/retiolum/filepimp.pub b/kartei/makefu/retiolum/filepimp.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/filepimp.pub rename to kartei/makefu/retiolum/filepimp.pub diff --git a/krebs/3modules/makefu/retiolum/filepimp_ed25519.pub b/kartei/makefu/retiolum/filepimp_ed25519.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/filepimp_ed25519.pub rename to kartei/makefu/retiolum/filepimp_ed25519.pub diff --git a/krebs/3modules/makefu/retiolum/firecracker.pub b/kartei/makefu/retiolum/firecracker.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/firecracker.pub rename to kartei/makefu/retiolum/firecracker.pub diff --git a/krebs/3modules/makefu/retiolum/firecracker_ed25519.pub b/kartei/makefu/retiolum/firecracker_ed25519.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/firecracker_ed25519.pub rename to kartei/makefu/retiolum/firecracker_ed25519.pub diff --git a/krebs/3modules/makefu/retiolum/flap.pub b/kartei/makefu/retiolum/flap.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/flap.pub rename to kartei/makefu/retiolum/flap.pub diff --git a/krebs/3modules/makefu/retiolum/flap_ed25519.pub b/kartei/makefu/retiolum/flap_ed25519.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/flap_ed25519.pub rename to kartei/makefu/retiolum/flap_ed25519.pub diff --git a/krebs/3modules/makefu/retiolum/gum.pub b/kartei/makefu/retiolum/gum.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/gum.pub rename to kartei/makefu/retiolum/gum.pub diff --git a/krebs/3modules/makefu/retiolum/gum_ed25519.pub b/kartei/makefu/retiolum/gum_ed25519.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/gum_ed25519.pub rename to kartei/makefu/retiolum/gum_ed25519.pub diff --git a/krebs/3modules/makefu/retiolum/latte.pub b/kartei/makefu/retiolum/latte.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/latte.pub rename to kartei/makefu/retiolum/latte.pub diff --git a/krebs/3modules/makefu/retiolum/latte_ed25519.pub b/kartei/makefu/retiolum/latte_ed25519.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/latte_ed25519.pub rename to kartei/makefu/retiolum/latte_ed25519.pub diff --git a/krebs/3modules/makefu/retiolum/nukular.pub b/kartei/makefu/retiolum/nukular.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/nukular.pub rename to kartei/makefu/retiolum/nukular.pub diff --git a/krebs/3modules/makefu/retiolum/nukular_ed25519.pub b/kartei/makefu/retiolum/nukular_ed25519.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/nukular_ed25519.pub rename to kartei/makefu/retiolum/nukular_ed25519.pub diff --git a/krebs/3modules/makefu/retiolum/omo.pub b/kartei/makefu/retiolum/omo.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/omo.pub rename to kartei/makefu/retiolum/omo.pub diff --git a/krebs/3modules/makefu/retiolum/omo_ed25519.pub b/kartei/makefu/retiolum/omo_ed25519.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/omo_ed25519.pub rename to kartei/makefu/retiolum/omo_ed25519.pub diff --git a/krebs/3modules/makefu/retiolum/sdev.pub b/kartei/makefu/retiolum/sdev.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/sdev.pub rename to kartei/makefu/retiolum/sdev.pub diff --git a/krebs/3modules/makefu/retiolum/sdev_ed25519.pub b/kartei/makefu/retiolum/sdev_ed25519.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/sdev_ed25519.pub rename to kartei/makefu/retiolum/sdev_ed25519.pub diff --git a/krebs/3modules/makefu/retiolum/senderechner.pub b/kartei/makefu/retiolum/senderechner.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/senderechner.pub rename to kartei/makefu/retiolum/senderechner.pub diff --git a/krebs/3modules/makefu/retiolum/senderechner_ed25519.pub b/kartei/makefu/retiolum/senderechner_ed25519.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/senderechner_ed25519.pub rename to kartei/makefu/retiolum/senderechner_ed25519.pub diff --git a/krebs/3modules/makefu/retiolum/studio.pub b/kartei/makefu/retiolum/studio.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/studio.pub rename to kartei/makefu/retiolum/studio.pub diff --git a/krebs/3modules/makefu/retiolum/studio_ed25519.pub b/kartei/makefu/retiolum/studio_ed25519.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/studio_ed25519.pub rename to kartei/makefu/retiolum/studio_ed25519.pub diff --git a/krebs/3modules/makefu/retiolum/tsp.pub b/kartei/makefu/retiolum/tsp.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/tsp.pub rename to kartei/makefu/retiolum/tsp.pub diff --git a/krebs/3modules/makefu/retiolum/tsp_ed25519.pub b/kartei/makefu/retiolum/tsp_ed25519.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/tsp_ed25519.pub rename to kartei/makefu/retiolum/tsp_ed25519.pub diff --git a/krebs/3modules/makefu/retiolum/vbob.pub b/kartei/makefu/retiolum/vbob.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/vbob.pub rename to kartei/makefu/retiolum/vbob.pub diff --git a/krebs/3modules/makefu/retiolum/vbob_ed25519.pub b/kartei/makefu/retiolum/vbob_ed25519.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/vbob_ed25519.pub rename to kartei/makefu/retiolum/vbob_ed25519.pub diff --git a/krebs/3modules/makefu/retiolum/wbob.pub b/kartei/makefu/retiolum/wbob.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/wbob.pub rename to kartei/makefu/retiolum/wbob.pub diff --git a/krebs/3modules/makefu/retiolum/wbob_ed25519.pub b/kartei/makefu/retiolum/wbob_ed25519.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/wbob_ed25519.pub rename to kartei/makefu/retiolum/wbob_ed25519.pub diff --git a/krebs/3modules/makefu/retiolum/x.pub b/kartei/makefu/retiolum/x.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/x.pub rename to kartei/makefu/retiolum/x.pub diff --git a/krebs/3modules/makefu/retiolum/x_ed25519.pub b/kartei/makefu/retiolum/x_ed25519.pub similarity index 100% rename from krebs/3modules/makefu/retiolum/x_ed25519.pub rename to kartei/makefu/retiolum/x_ed25519.pub diff --git a/krebs/3modules/makefu/ssh/makefu.android.pub b/kartei/makefu/ssh/makefu.android.pub similarity index 100% rename from krebs/3modules/makefu/ssh/makefu.android.pub rename to kartei/makefu/ssh/makefu.android.pub diff --git a/krebs/3modules/makefu/ssh/makefu.bob.pub b/kartei/makefu/ssh/makefu.bob.pub similarity index 100% rename from krebs/3modules/makefu/ssh/makefu.bob.pub rename to kartei/makefu/ssh/makefu.bob.pub diff --git a/krebs/3modules/makefu/ssh/makefu.omo.pub b/kartei/makefu/ssh/makefu.omo.pub similarity index 100% rename from krebs/3modules/makefu/ssh/makefu.omo.pub rename to 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 similarity index 100% rename from krebs/3modules/makefu/ssh/makefu.remote-builder.pub rename to kartei/makefu/ssh/makefu.remote-builder.pub diff --git a/krebs/3modules/makefu/ssh/makefu.tempx.pub b/kartei/makefu/ssh/makefu.tempx.pub similarity index 100% rename from krebs/3modules/makefu/ssh/makefu.tempx.pub rename to kartei/makefu/ssh/makefu.tempx.pub diff --git a/krebs/3modules/makefu/ssh/makefu.tsp.pub b/kartei/makefu/ssh/makefu.tsp.pub similarity index 100% rename from krebs/3modules/makefu/ssh/makefu.tsp.pub rename to kartei/makefu/ssh/makefu.tsp.pub diff --git a/krebs/3modules/makefu/ssh/makefu.vbob.pub b/kartei/makefu/ssh/makefu.vbob.pub similarity index 100% rename from krebs/3modules/makefu/ssh/makefu.vbob.pub rename to kartei/makefu/ssh/makefu.vbob.pub diff --git a/krebs/3modules/makefu/ssh/makefu.x.pub b/kartei/makefu/ssh/makefu.x.pub similarity index 100% rename from krebs/3modules/makefu/ssh/makefu.x.pub rename to kartei/makefu/ssh/makefu.x.pub diff --git a/krebs/3modules/makefu/sshd/cake.pub b/kartei/makefu/sshd/cake.pub similarity index 100% rename from krebs/3modules/makefu/sshd/cake.pub rename to kartei/makefu/sshd/cake.pub diff --git a/krebs/3modules/makefu/sshd/crapi.pub b/kartei/makefu/sshd/crapi.pub similarity index 100% rename from krebs/3modules/makefu/sshd/crapi.pub rename to kartei/makefu/sshd/crapi.pub diff --git a/krebs/3modules/makefu/sshd/fileleech.pub b/kartei/makefu/sshd/fileleech.pub similarity index 100% rename from krebs/3modules/makefu/sshd/fileleech.pub rename to kartei/makefu/sshd/fileleech.pub diff --git a/krebs/3modules/makefu/sshd/firecracker.pub b/kartei/makefu/sshd/firecracker.pub similarity index 100% rename from krebs/3modules/makefu/sshd/firecracker.pub rename to kartei/makefu/sshd/firecracker.pub diff --git a/krebs/3modules/makefu/sshd/gum.pub b/kartei/makefu/sshd/gum.pub similarity index 100% rename from krebs/3modules/makefu/sshd/gum.pub rename to kartei/makefu/sshd/gum.pub diff --git a/krebs/3modules/makefu/sshd/omo.pub b/kartei/makefu/sshd/omo.pub similarity index 100% rename from krebs/3modules/makefu/sshd/omo.pub rename to kartei/makefu/sshd/omo.pub diff --git a/krebs/3modules/makefu/sshd/sdev.pub b/kartei/makefu/sshd/sdev.pub similarity index 100% rename from krebs/3modules/makefu/sshd/sdev.pub rename to kartei/makefu/sshd/sdev.pub diff --git a/krebs/3modules/makefu/sshd/studio.pub b/kartei/makefu/sshd/studio.pub similarity index 100% rename from krebs/3modules/makefu/sshd/studio.pub rename to kartei/makefu/sshd/studio.pub diff --git a/krebs/3modules/makefu/sshd/wbob.pub b/kartei/makefu/sshd/wbob.pub similarity index 100% rename from krebs/3modules/makefu/sshd/wbob.pub rename to kartei/makefu/sshd/wbob.pub diff --git a/krebs/3modules/makefu/sshd/x.pub b/kartei/makefu/sshd/x.pub similarity index 100% rename from krebs/3modules/makefu/sshd/x.pub rename to kartei/makefu/sshd/x.pub diff --git a/krebs/3modules/makefu/wiregrill/gum.pub b/kartei/makefu/wiregrill/gum.pub similarity index 100% rename from krebs/3modules/makefu/wiregrill/gum.pub rename to kartei/makefu/wiregrill/gum.pub diff --git a/krebs/3modules/makefu/wiregrill/rockit.pub b/kartei/makefu/wiregrill/rockit.pub similarity index 100% rename from krebs/3modules/makefu/wiregrill/rockit.pub rename to kartei/makefu/wiregrill/rockit.pub diff --git a/krebs/3modules/makefu/wiregrill/shackdev.pub b/kartei/makefu/wiregrill/shackdev.pub similarity index 100% rename from krebs/3modules/makefu/wiregrill/shackdev.pub rename to kartei/makefu/wiregrill/shackdev.pub diff --git a/krebs/3modules/makefu/wiregrill/x.pub b/kartei/makefu/wiregrill/x.pub similarity index 100% rename from krebs/3modules/makefu/wiregrill/x.pub rename to kartei/makefu/wiregrill/x.pub diff --git a/krebs/3modules/external/mic92.nix b/kartei/mic92/default.nix similarity index 99% rename from krebs/3modules/external/mic92.nix rename to 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 ; +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 similarity index 100% rename from krebs/3modules/external/ssh/mic92.pub rename to kartei/mic92/ssh/mic92.pub diff --git a/krebs/3modules/external/default.nix b/kartei/others/default.nix similarity index 99% rename from krebs/3modules/external/default.nix rename to kartei/others/default.nix index 989961490..214880cb3 100644 --- a/krebs/3modules/external/default.nix +++ b/kartei/others/default.nix @@ -1,4 +1,4 @@ -with import ; +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"; }; diff --git a/krebs/3modules/external/ssh/0x4A6F.pub b/kartei/others/ssh/0x4A6F.pub similarity index 100% rename from krebs/3modules/external/ssh/0x4A6F.pub rename to kartei/others/ssh/0x4A6F.pub diff --git a/krebs/3modules/external/ssh/exco.pub b/kartei/others/ssh/exco.pub similarity index 100% rename from krebs/3modules/external/ssh/exco.pub rename to kartei/others/ssh/exco.pub diff --git a/krebs/3modules/external/ssh/hase.pub b/kartei/others/ssh/hase.pub similarity index 100% rename from krebs/3modules/external/ssh/hase.pub rename to kartei/others/ssh/hase.pub diff --git a/krebs/3modules/external/ssh/neos.pub b/kartei/others/ssh/neos.pub similarity index 100% rename from krebs/3modules/external/ssh/neos.pub rename to kartei/others/ssh/neos.pub diff --git a/krebs/3modules/external/ssh/qubasa.pub b/kartei/others/ssh/qubasa.pub similarity index 100% rename from krebs/3modules/external/ssh/qubasa.pub rename to kartei/others/ssh/qubasa.pub diff --git a/krebs/3modules/external/ssh/raute.pub b/kartei/others/ssh/raute.pub similarity index 100% rename from krebs/3modules/external/ssh/raute.pub rename to kartei/others/ssh/raute.pub diff --git a/krebs/3modules/external/ssh/rtjure.pub b/kartei/others/ssh/rtjure.pub similarity index 100% rename from krebs/3modules/external/ssh/rtjure.pub rename to kartei/others/ssh/rtjure.pub diff --git a/krebs/3modules/external/ssh/shannan.pub b/kartei/others/ssh/shannan.pub similarity index 100% rename from krebs/3modules/external/ssh/shannan.pub rename to kartei/others/ssh/shannan.pub diff --git a/krebs/3modules/external/ssh/ulrich.pub b/kartei/others/ssh/ulrich.pub similarity index 100% rename from krebs/3modules/external/ssh/ulrich.pub rename to kartei/others/ssh/ulrich.pub diff --git a/krebs/3modules/external/ssh/xkey.pub b/kartei/others/ssh/xkey.pub similarity index 100% rename from krebs/3modules/external/ssh/xkey.pub rename to kartei/others/ssh/xkey.pub diff --git a/krebs/3modules/external/ssh/xq.pub b/kartei/others/ssh/xq.pub similarity index 100% rename from krebs/3modules/external/ssh/xq.pub rename to kartei/others/ssh/xq.pub diff --git a/krebs/3modules/external/tinc/hasegateway.pub b/kartei/others/tinc/hasegateway.pub similarity index 100% rename from krebs/3modules/external/tinc/hasegateway.pub rename to kartei/others/tinc/hasegateway.pub diff --git a/krebs/3modules/external/tinc/horisa.pub b/kartei/others/tinc/horisa.pub similarity index 100% rename from krebs/3modules/external/tinc/horisa.pub rename to kartei/others/tinc/horisa.pub diff --git a/krebs/3modules/external/tinc/justraute.pub b/kartei/others/tinc/justraute.pub similarity index 100% rename from krebs/3modules/external/tinc/justraute.pub rename to kartei/others/tinc/justraute.pub diff --git a/krebs/3modules/external/tinc/tpsw.pub b/kartei/others/tinc/tpsw.pub similarity index 100% rename from krebs/3modules/external/tinc/tpsw.pub rename to kartei/others/tinc/tpsw.pub diff --git a/krebs/3modules/external/palo.nix b/kartei/palo/default.nix similarity index 87% rename from krebs/3modules/external/palo.nix rename to 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 ; +with import ../../lib; { config, ... }: let hostDefaults = hostName: host: flip recursiveUpdate host ({ @@ -12,8 +12,6 @@ with import ; 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 similarity index 100% rename from krebs/3modules/external/tinc/palo.pub rename to kartei/palo/retiolum.pub diff --git a/krebs/3modules/external/rtunreal.nix b/kartei/rtunreal/default.nix similarity index 98% rename from krebs/3modules/external/rtunreal.nix rename to 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 ; +with import ../../lib; { config, ... }: let hostDefaults = hostName: host: flip recursiveUpdate host ({ diff --git a/krebs/3modules/tv/default.nix b/kartei/tv/default.nix similarity index 99% rename from krebs/3modules/tv/default.nix rename to 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 similarity index 100% rename from krebs/3modules/tv/pgp/CBF89B0B.asc rename to kartei/tv/pgp/CBF89B0B.asc diff --git a/krebs/3modules/tv/wiregrill/alnus.pub b/kartei/tv/wiregrill/alnus.pub similarity index 100% rename from krebs/3modules/tv/wiregrill/alnus.pub rename to kartei/tv/wiregrill/alnus.pub diff --git a/krebs/3modules/tv/wiregrill/mu.pub b/kartei/tv/wiregrill/mu.pub similarity index 100% rename from krebs/3modules/tv/wiregrill/mu.pub rename to kartei/tv/wiregrill/mu.pub diff --git a/krebs/3modules/tv/wiregrill/ni.pub b/kartei/tv/wiregrill/ni.pub similarity index 100% rename from krebs/3modules/tv/wiregrill/ni.pub rename to kartei/tv/wiregrill/ni.pub diff --git a/krebs/3modules/tv/wiregrill/nomic.pub b/kartei/tv/wiregrill/nomic.pub similarity index 100% rename from krebs/3modules/tv/wiregrill/nomic.pub rename to kartei/tv/wiregrill/nomic.pub diff --git a/krebs/3modules/tv/wiregrill/querel.pub b/kartei/tv/wiregrill/querel.pub similarity index 100% rename from krebs/3modules/tv/wiregrill/querel.pub rename to kartei/tv/wiregrill/querel.pub diff --git a/krebs/3modules/tv/wiregrill/umz.pub b/kartei/tv/wiregrill/umz.pub similarity index 100% rename from krebs/3modules/tv/wiregrill/umz.pub rename to kartei/tv/wiregrill/umz.pub diff --git a/krebs/3modules/tv/wiregrill/wu.pub b/kartei/tv/wiregrill/wu.pub similarity index 100% rename from krebs/3modules/tv/wiregrill/wu.pub rename to kartei/tv/wiregrill/wu.pub diff --git a/krebs/3modules/tv/wiregrill/xu.pub b/kartei/tv/wiregrill/xu.pub similarity index 100% rename from krebs/3modules/tv/wiregrill/xu.pub rename to kartei/tv/wiregrill/xu.pub diff --git a/krebs/3modules/tv/wiregrill/zu.pub b/kartei/tv/wiregrill/zu.pub similarity index 100% rename from krebs/3modules/tv/wiregrill/zu.pub rename to kartei/tv/wiregrill/zu.pub 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";