From a93e818337afdb82245d0ce7d4dfe9044a228820 Mon Sep 17 00:00:00 2001
From: samularity <samuelmunz@gmx.de>
Date: Wed, 5 Jul 2023 22:53:36 +0200
Subject: [PATCH 1/4] kartei samulartiy: init murks
---
kartei/samularity/default.nix | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 kartei/samularity/default.nix
diff --git a/kartei/samularity/default.nix b/kartei/samularity/default.nix
new file mode 100644
index 000000000..93748cd87
--- /dev/null
+++ b/kartei/samularity/default.nix
@@ -0,0 +1,31 @@
+{ config, lib, ... }: let
+ slib = import ../../lib/pure.nix { inherit lib; };
+in {
+ users.samularity = {
+ mail = "samularity@murks.r";
+ };
+ hosts.murks = {
+ owner = config.krebs.users.samularity;
+ nets.retiolum = {
+ aliases = [ "murks.r" ];
+ ip6.addr = (slib.krebs.genipv6 "retiolum" "samularity" { hostName = "murks"; }).address;
+ ip4.addr = "10.243.0.42";
+ tinc.pubkey = ''
+ -----BEGIN RSA PUBLIC KEY-----
+ MIICCgKCAgEAsooKgG5zkt4lPY7ROxnwuGuDTfN9YZPsKHnENjmzvMkfdwdM3aGW
+ 2fkZfn8Q8pQ0eJaTJ8/Lavk1LKOB5pgkuloyOtPfpmJY++LAn37rNxnQvUWP3kS4
+ JJ78whRJqczO4b3TEh2Dm/DsvH3E/Gpwq5TXiRzbjQ9hspZlPptRkda0UveAh1fn
+ wFVBtUEOmQZ3cpGCAdo2sMcBoZwJXSQAm4z2P+eTXXo2IIjWgS8zQu5nvX/y4RG8
+ D+HSe/X58yVRww4ABU4g7cNzzqLVKFEAuznlmpiZZ6EMGZ7xbZQlDmJuAIHIXrn+
+ JVc1Yo/WmFYbN/6CmIUHE80/434Zg1dK87honUXizeDO2cyIb1vEG432Eqd3TsG7
+ 3YjJOHqaiNqBd60tFrT87mjbuCiD6jKlA5AQtzSSdDhq8G0i0Il8Do6SnpY2ACx2
+ CvF6s3sWXP3YtY/AupB+okPoqvC+96Oxs2KJwQSatQlDr0aarror19NKC6b/Y4qo
+ C0tcDa7VZiOB+rM6iIjRiM3QEyWEBia3nj2n5T98DgPooqmSF2p4NKYcaBMSv3f5
+ aD2oZzdBqZnPAbi2CNoNN9pdVOB0Ckt9DaiMaiROEeAvxL3xxwaWhMPBFbSvGhca
+ ciMdqaPlgqKu7WGtmU4a0U3JXhWTjin1mroD3kduykgek4fAmvcP540CAwEAAQ==
+ -----END RSA PUBLIC KEY-----
+ '';
+ tinc.pubkey_ed25519 = "4ZAQxhHBUT9KSof2tjadgMHD5kxND0AtXgjdTzs/F+L";
+ };
+ };
+}
From 58298244f654d21fa49d37d18e78c1773d60fb15 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 6 Jul 2023 20:52:10 +0200
Subject: [PATCH 2/4] flakes: expose krebs.pkgs overlay
---
flake.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/flake.nix b/flake.nix
index 6c094b6a9..1ff183e74 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,6 +36,7 @@
hosts = self.nixosConfigurations.hotdog.config.krebs.hosts;
users = self.nixosConfigurations.hotdog.config.krebs.users;
};
+ overlays.default = import ./krebs/5pkgs/default.nix;
lib = import (self.outPath + "/lib/pure.nix") { lib = nixpkgs.lib; };
};
}
From 6f054d31f40d9421e0131e07058738d48929b661 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 6 Jul 2023 20:52:33 +0200
Subject: [PATCH 3/4] modules: expose kartei as module
---
krebs/3modules/kartei.nix | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 krebs/3modules/kartei.nix
diff --git a/krebs/3modules/kartei.nix b/krebs/3modules/kartei.nix
new file mode 100644
index 000000000..3dcb65ff6
--- /dev/null
+++ b/krebs/3modules/kartei.nix
@@ -0,0 +1,3 @@
+{
+ imports = [ ../../kartei ];
+}
From 4ed74041f7fa2d1554770eb3bb65c8774dd529eb Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 6 Jul 2023 20:57:20 +0200
Subject: [PATCH 4/4] modules/default: sort entries
---
krebs/3modules/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 28ce09941..5d12ea7af 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -1,7 +1,6 @@
{ config, lib, ... }:
{
imports = [
- ../../kartei
./acl.nix
./airdcpp.nix
./announce-activation.nix
@@ -28,9 +27,10 @@
./iana-etc.nix
./iptables.nix
./kapacitor.nix
+ ./kartei.nix
./konsens.nix
- ./krebs.nix
./krebs-pages.nix
+ ./krebs.nix
./monit.nix
./nixpkgs.nix
./on-failure.nix
@@ -45,8 +45,8 @@
./secret.nix
./setuid.nix
./shadow.nix
- ./ssh.nix
./sitemap.nix
+ ./ssh.nix
./ssl.nix
./sync-containers.nix
./sync-containers3.nix