summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <git@lassul.us>2023-03-26 06:10:37 +0200
committerlassulus <git@lassul.us>2023-03-26 06:10:37 +0200
commitacbdb53d8e0a3f385a1bd7a7610baa9b072a8572 (patch)
tree3f0196d90619b746306aee9d185ee86817bfe1c5
parent2c80bbb28362fd442ad73ffbcf36796105bf9ae9 (diff)
parent14f814c23622cb7c127553d5eb1f872f97fa50b6 (diff)
Merge remote-tracking branch 'mic92/master'
-rw-r--r--kartei/mic92/default.nix1
-rw-r--r--kartei/srounce/default.nix34
2 files changed, 35 insertions, 0 deletions
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-----
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";
+ };
+ };
+ };
+}