From 8bd901273f4d0d6e6170f8cd91bf8d6dbf828a92 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Wed, 13 Sep 2023 22:56:56 +0200
Subject: kartei lass: remove echelon.r

---
 kartei/lass/echelon.nix | 42 ------------------------------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 kartei/lass/echelon.nix

(limited to 'kartei/lass')

diff --git a/kartei/lass/echelon.nix b/kartei/lass/echelon.nix
deleted file mode 100644
index d66033ba4..000000000
--- a/kartei/lass/echelon.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ r6, w6, ... }:
-{
-  nets = {
-    retiolum = {
-      ip4.addr = "10.243.0.3";
-      ip6.addr = r6 "4";
-      aliases = [
-        "echelon.r"
-      ];
-      tinc = {
-        pubkey = ''
-          -----BEGIN PUBLIC KEY-----
-          MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxTpl0YvJWiF9cAYeAdp
-          1gG18vrSeYDpmVCsZmxi2qyeWNM4JGSVPYoagyKHSDGH60xvktRh/1Zat+1hHR0A
-          MAjDIENn9hAICQ8lafnm2v3+xzLNoTMJTYG3eba2MlJpAH0rYP0E5xBhQj9DCSAe
-          UpEZWAwCKDCOmg/9h0gvs3kh0HopwjOE1IEzApgg05Yuhna96IATVdBAC7uF768V
-          rJZNkQRvhetGxB459C58uMdcRK3degU6HMpZIXjJk6bqkzKBMm7C3lsAfaWulfez
-          gavFSHC15NbHkz+fcVZNZReJhfTHP7k05xo5vYpDhszdUSjc3MtWBmk5v9zdS1pO
-          c+20a1eurr1EPoYBqjQL0tLBwuQc2tN5XqJKVY5LGAnojAI6ktPKPLR6qZHC4Kna
-          dgJ/S1BzHVxniYh3/rEzhXioneZ6oZgO+65WtsS42WAvh/53U/Q3chgI074Jssze
-          ev09+zU8Xj0vX/7KpRKy5Vln6RGkQbKAIt7TZL5cJALswQDzcCO4WTv1X5KoG3+D
-          KfTMfl9HzFsv59uHKlUqUguN5e8CLdmjgU1v2WvHBCw1PArIE8ZC0Tu2bMi5i9Vq
-          GHxVn9O4Et5yPocyQtE4zOfGfqwR/yNa//Zs1b6DxQ73tq7rbBQaAzq7lxW6Ndbr
-          43jjLL40ONdFxX7qW/DhT9MCAwEAAQ==
-          -----END PUBLIC KEY-----
-        '';
-        pubkey_ed25519 = "LgJ7+/sq7t+Ym/DjJrWesIpUw1Lw7bxPi0XFHtsVWLB";
-      };
-    };
-    wiregrill = {
-      ip6.addr = w6 "3";
-      aliases = [
-        "echelon.w"
-      ];
-      wireguard.pubkey = ''
-        SLdk0lph2rSFU+3dyrWDU1CT/oU+HPcOVYeGVIgDpEc=
-      '';
-    };
-  };
-  ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIn+o0uCBSot254kZKlNepVKFcwDPdr8s6+lQmYGM3Hd ";
-  syncthing.id = "TT4MBZS-YNDZUYO-Y6L4GOK-5IYUCXY-2RKFOSK-5SMZYSR-5QMOXSS-6DNJIAZ";
-}
-- 
cgit v1.2.3


From a2a9a8941107320d7e5badb46acd538c7ac39754 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Fri, 15 Sep 2023 15:45:02 +0200
Subject: kartei l: move flix.r to yellow.r

---
 kartei/lass/prism.nix  | 1 -
 kartei/lass/yellow.nix | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'kartei/lass')

diff --git a/kartei/lass/prism.nix b/kartei/lass/prism.nix
index ecb56264f..4e706083c 100644
--- a/kartei/lass/prism.nix
+++ b/kartei/lass/prism.nix
@@ -66,7 +66,6 @@ rec {
         "cache.prism.r"
         "cgit.prism.r"
         "bota.r"
-        "flix.r"
         "paste.r"
         "c.r"
         "p.r"
diff --git a/kartei/lass/yellow.nix b/kartei/lass/yellow.nix
index b9dcb008c..1873e02dc 100644
--- a/kartei/lass/yellow.nix
+++ b/kartei/lass/yellow.nix
@@ -7,6 +7,7 @@
       aliases = [
         "yellow.r"
         "jelly.r"
+        "flix.r"
         "radar.r"
         "sonar.r"
         "transmission.r"
-- 
cgit v1.2.3


From 0ea93f6de78169f73cfea8935fb5173904ac8c8e Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Wed, 20 Sep 2023 13:36:29 +0200
Subject: l prism.r: add {flex,flux}.lassul.us

---
 kartei/lass/prism.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'kartei/lass')

diff --git a/kartei/lass/prism.nix b/kartei/lass/prism.nix
index 4e706083c..a44e120b2 100644
--- a/kartei/lass/prism.nix
+++ b/kartei/lass/prism.nix
@@ -37,6 +37,8 @@ rec {
       mail                60 IN A      ${nets.internet.ip4.addr}
       mail                60 IN AAAA   ${nets.internet.ip6.addr}
       flix                60 IN A      ${nets.internet.ip4.addr}
+      flex                60 IN A      ${nets.internet.ip4.addr}
+      flux                60 IN A      ${nets.internet.ip4.addr}
       testing             60 IN A      ${nets.internet.ip4.addr}
       schrott             60 IN A      ${nets.internet.ip4.addr}
     '';
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/5a100000.lock: No such file or directory (2)