From c550360305765350257d92fb792baa7f8b86a986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 24 Mar 2023 18:24:48 +0100
Subject: kartei/srounce: init

---
 kartei/srounce/default.nix | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 kartei/srounce/default.nix

diff --git a/kartei/srounce/default.nix b/kartei/srounce/default.nix
new file mode 100644
index 000000000..ef37cbcd1
--- /dev/null
+++ b/kartei/srounce/default.nix
@@ -0,0 +1,34 @@
+{ config, ... }: let
+  lib = import ../../lib;
+
+  hostDefaults = hostName: host: lib.flip lib.recursiveUpdate host ({
+    ci = false;
+    external = true;
+    monitoring = false;
+  } // lib.optionalAttrs (host.nets?retiolum) {
+    nets.retiolum.ip6.addr =
+      (lib.krebs.genipv6 "retiolum" "external" { inherit hostName; }).address;
+  });
+
+in {
+  users.srounce.mail = "samuelrounce@gmail.com";
+  hosts = lib.mapAttrs hostDefaults {
+    workbox = {
+      owner = config.krebs.users.srounce;
+      nets.retiolum = {
+        aliases = [ "srounce.r" ];
+        tinc.pubkey = ''
+          -----BEGIN RSA PUBLIC KEY-----
+          MIIBCgKCAQEAsLQ4ZEwEbgHCh7yQvZWms6586Q3Ni+dF6pmkQdxrNb/BLlplB2Db
+          sDYVMAfamXDd/jPKpoevwRaXoImxk1IHSN4ZJ2liaZNDBOJJ0CnXdJHGQ3SnV50x
+          9ABAeP/lmT95lhWuCg0qS0xY60ax3EDhTVYk51dPwwoBNE6dwO/lJr6vgtKBI7fV
+          /IgoF7L8G7AEPz61vS0sCHld537bEPfZ3Us4gUC6/V+xKnkBRDuCgFxemOjNdu0F
+          cqEyxwrPcQoFtOt9ZDF8817qdFsRQsgM8LsnDti8mhxDR/0deTYARkWIoRjLU+p9
+          XLCdDBEGsbl4Bb6tYT9jz9RCNNJeXogE2wIDAQAB
+          -----END RSA PUBLIC KEY-----
+        '';
+        tinc.pubkey_ed25519 = "E9bMsS3w72hIjp2fYicwgpdwSJDUQbh2dHEDk6F5JdO";
+      };
+    };
+  };
+}
-- 
cgit v1.2.3


From 14f814c23622cb7c127553d5eb1f872f97fa50b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 25 Mar 2023 19:38:52 +0100
Subject: kartei/mic92: add llama.r

---
 kartei/mic92/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kartei/mic92/default.nix b/kartei/mic92/default.nix
index 04aa57d1d..78206a241 100644
--- a/kartei/mic92/default.nix
+++ b/kartei/mic92/default.nix
@@ -788,6 +788,7 @@ in {
           aliases = [
             "jack.r"
             "stable-confusion.r"
+            "llama.r"
           ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
-- 
cgit v1.2.3