ctucx.git: nixfiles

ctucx' nixfiles

commit 81c180bc7ebffb484111078433441068a0f9ddb6
parent d77148118aa601f96329e9ef2d5df603c0ef0610
Author: Leah (ctucx) <git@ctu.cx>
Date: Wed, 3 Apr 2024 14:52:51 +0200

machines: move `trabbi` to new host

26 files changed, 273 insertions(+), 261 deletions(-)
M
configurations/linux/default.nix
|
4
++--
M
machines/trabbi/configuration.nix
|
39
++++++++++++++++++++++-----------------
M
machines/trabbi/hardware-configuration.nix
|
15
+++++++++++----
M
machines/trabbi/websites/things.ctu.cx.nix
|
2
+-
M
secrets/briefkasten/influx/grafana_token_mqttData.age
|
25
++++++++++++-------------
M
secrets/briefkasten/influx/grafana_token_solaxData.age
|
24
++++++++++++------------
M
secrets/restic-server/briefkasten.age
|
24
+++++++++++++-----------
M
secrets/restic-server/wanderduene.age
|
26
+++++++++++++-------------
M
secrets/secrets.nix
|
33
++++++++++++++++-----------------
M
secrets/trabbi/mail/password-leah-ctu.cx.age
|
18
+++++++++---------
M
secrets/trabbi/mail/password-mail-zug.network.age
|
21
+++++++++++----------
M
secrets/trabbi/mail/password-vaultwarden-ctu.cx.age
|
20
+++++++++-----------
M
secrets/trabbi/matrix-synapse/registration_shared_secret.age
|
19
+++++++++----------
M
secrets/trabbi/matrix-synapse/s3_secrets.age
|
24
+++++++++++++-----------
A
secrets/trabbi/matrix-synapse/sliding-sync-env.age
|
11
+++++++++++
M
secrets/trabbi/radicale-users.age
|
23
+++++++++++------------
M
secrets/trabbi/restic/ctucx-things.age
|
21
+++++++++++----------
M
secrets/trabbi/restic/gitolite.age
|
20
+++++++++++---------
M
secrets/trabbi/restic/gotosocial.age
|
19
+++++++++----------
M
secrets/trabbi/restic/mail.age
|
21
+++++++++++----------
M
secrets/trabbi/restic/matrix-synapse.age
|
21
++++++++++-----------
D
secrets/trabbi/restic/pleroma.age
|
13
-------------
M
secrets/trabbi/restic/radicale.age
|
21
+++++++++++----------
M
secrets/trabbi/restic/vaultwarden.age
|
17
++++++++---------
M
secrets/trabbi/travelynx2fedi-env.age
|
23
++++++++++++-----------
M
secrets/trabbi/vaultwarden-secrets.age
|
30
+++++++++++++++---------------
diff --git a/configurations/linux/default.nix b/configurations/linux/default.nix
@@ -28,11 +28,11 @@
     settings.trusted-users       = [ "@wheel" ];
     settings.auto-optimise-store = true;
     optimise     = {
-      automatic = true;
+      automatic = lib.mkDefault true;
       dates     = [ "12:00" "15:00" "18:00" "21:00" ];
     };
     gc           = {
-      automatic = true;
+      automatic = lib.mkDefault true;
       options   = "--delete-older-than 3d";
       dates     = "18:00";
     };

diff --git a/machines/trabbi/configuration.nix b/machines/trabbi/configuration.nix
@@ -8,28 +8,27 @@
   imports = [
     ./hardware-configuration.nix
 
-    # git server (gitolite+stagit)
-    ./git.nix
+    # monitoring
+    ./prometheus.nix
+    ./grafana
 
     # cal- and card-dav server
     ./radicale.nix
 
-    # monitoring
-    ./prometheus.nix
-    ./grafana
+    # git server (gitolite+stagit)
+    ./git.nix
+
+    # vaultwarden password-store
+    ./vaultwarden.nix
 
     # communication
     ./fedi
-    ./mail
     ./matrix
+    ./mail
 
-    # vaultwarden password-store
-    ./vaultwarden.nix
-
-    # websites
     ./websites
-    ./travelynx2fedi.nix
     ./grocy.nix
+    ./travelynx2fedi.nix
   ];
 
   dns.zones."ctu.cx".subdomains."${config.networking.hostName}" = (pkgs.dns.lib.combinators.host config.networking.primaryIP4 config.networking.primaryIP);

@@ -58,17 +57,23 @@
         ip route add default via fe80::1 dev ens3 onlink
 
         ip addr add ${config.networking.primaryIP4}/22 dev ens3
-        ip route add default via 89.58.62.1 dev ens3 onlink
+        ip route add default via ${config.networking.defaultGateway.address} dev ens3 onlink
         echo 'cryptsetup-askpass' >> /root/.profile
       '';
     };
   };
 
   networking = {
-    primaryIP    = "2a0a:4cc0:1:2d7::1";
-    primaryIP4   = "89.58.62.171";
+    primaryIP    = "2a03:4000:50:e8::1";
+    primaryIP4   = "94.16.104.148";
+
+    resolvconf.enable = false;
+    nameservers       = [ "8.8.8.8" "1.1.1.1" ];
 
-    defaultGateway  = "89.58.60.1";
+    defaultGateway  = {
+      interface = "ens3";
+      address    = "94.16.104.1";
+    };
     defaultGateway6 = {
       interface = "ens3";
       address   = "fe80::1";

@@ -90,8 +95,8 @@
 
   services.email-notify.enable = true;
 
-  system.stateVersion = "22.05";
-  home-manager.users.leah.home.stateVersion = "22.05";
+  system.stateVersion = "23.11";
+  home-manager.users.leah.home.stateVersion = "23.11";
 
 }
 

diff --git a/machines/trabbi/hardware-configuration.nix b/machines/trabbi/hardware-configuration.nix
@@ -14,18 +14,25 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/9f4a28bc-940c-4460-b3ee-cc3f3be71267";
+    { device = "/dev/disk/by-uuid/83c8b9f3-d5e2-46ac-a4d8-5dd02a1fd757";
       fsType = "ext4";
     };
 
-  boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/9358ba89-695a-4d00-af41-baf41d8f1845";
+  boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/492ea477-0dc2-4c4d-a1e1-5cc1073126fa";
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/5DB7-1BBF";
+    { device = "/dev/disk/by-uuid/4751-075E";
       fsType = "vfat";
     };
 
   swapDevices = [ ];
 
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.ens3.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }

diff --git a/machines/trabbi/websites/things.ctu.cx.nix b/machines/trabbi/websites/things.ctu.cx.nix
@@ -10,7 +10,7 @@
 
   age.secrets.restic-ctucx-things.file = ./. + "/../../../secrets/${config.networking.hostName}/restic/ctucx-things.age";
 
-  restic-backups.things = {
+  restic-backups.ctucx-things = {
     user            = "ctucx-things";
     passwordFile    = config.age.secrets.restic-ctucx-things.path;
     paths           = [ "/var/lib/ctucx-things" ];

diff --git a/secrets/briefkasten/influx/grafana_token_mqttData.age b/secrets/briefkasten/influx/grafana_token_mqttData.age
@@ -1,15 +1,14 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoMXNrZTBYdlBwN3ZCcytj
-MjI2UllETnNPTTdmT1dUT3I2VVVNNkpoQkFrCjVtRWp3cDliQXo3Y1lKbmpyczVq
-VGRBai9hbG4rN1hyYVp0UVIzbWZ0UHcKLT4gc3NoLWVkMjU1MTkgNGhLQ013IFM3
-SUk0VXhWTlBDR2dnQ00yM2lmREZoM1NkeGQrR1RJOWJjTDNaTlNGQjAKd0FXVUFG
-NHU0Y1JsbU11akxRWlc1Z1dGbG1wK2NGSXVheXJHdno1Z1UzRQotPiBzc2gtZWQy
-NTUxOSBWMHVVcncgTHUvbnVIRTFtbi9zaFZoZzBNcW80V29zRE5hWlVrSmIyS1Zw
-Z0xhZ0lqawpzazVMVHRmY2NER0N3L0hwdzdRVHN2b0NLQUM2UmI1WmJtdmtQRTYx
-Z3dvCi0+IHlnMDYtZ3JlYXNlIFwgVGRiWUlqX2sgNmAKZHAraitFQ0FDalFCQVFi
-Tk9QWlV3WnBxcTVFUnVTcHVQekFsVmhqNVZ4aXl4WlZRU2NsNFMraEoyYy9BMWJy
-dAo5bHNRUDU3SzlnSmlBeXcKLS0tIDU4SHZXNFMxRTJ6bk9ESnNZZkJNMFV2VmRK
-eHZhb2pMK1MyYjh6ZU5oT28Kz/NNH2AttZ3qi6gk1FXj/b2FO7YKlU8F7n3uMUTd
-Wx68nHGoRw00f07oxA6hfjd0AbZo5UcbxffFTrDGA6UhedH97zrMB0lrZRVf7ZWr
-ZGbeJXGEb3FPdQpoyxhmkpBhdfKRJr5rY+3iDDxl9YBAXItumilVzNMF
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrbitrUTdZaXVvRlhoWjdJ
+ZVdDVzI3VnB3cVM2V1FOdnJZWGQySDJKelVZCm4rTU96NEhRU3dHS0NrMHRBeENV
+YWlwUmk1QUZaV29tTlhrb0tQZUF5ekUKLT4gc3NoLWVkMjU1MTkgNGhLQ013IEFI
+Vk93eHhFV1pwVzdObUdKdzRFOGszejdMVTM2dzdxRWJMZGR3MFNZM1EKMWtWYzBN
+R1VneGJTS3ZCR2Z0SThndXhNb0x0UytJakFSL2ZQclJTRGQ2OAotPiBzc2gtZWQy
+NTUxOSBxOG9jemcgQWx0TWt0YjNEd1N0V1BUdnNwYSsxeUVxM1dXOUhSNXErMHZH
+TUtqMVR5SQpITm9zMUswekJTd05LRGlUci9XSzFCK1MzRkdWYUpDL2R1Rnd4MWR5
+eGVzCi0+IFo4dUEtZ3JlYXNlIGxsfWZEdV0qICVZIERbIHskdXJqOApCS2YweGk0
+Ci0tLSBpR2d4Y1VxcENRWkUrbmF0ZWtwVXhhN2JsS3g2M0ZNVTB4ODBScUh0cE5z
+CtcEmpYXY1ZxtSki0gC/kZXT1o+sv0hy0o2OUv62ftETBigfULtMV1SRyZKlKbcL
+qGwuLuVDL4dngwZBPZ821On+jUvH98ySbgUQysWFymCWA6ntlJKATiMHq/tHPJ0P
+YVpbXXDHENjsKZgOEC66vUvfFEx34iIk5A==
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/briefkasten/influx/grafana_token_solaxData.age b/secrets/briefkasten/influx/grafana_token_solaxData.age
@@ -1,14 +1,14 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzVGZyblRSc3RFWWlIaWdY
-eURNS3NCczdBV05qVjhPc0h3bXF1UW81cEZvCk9zVGl2WnQ5ZEE4T0toaUZBUFhz
-MzZ2MWRwMzVkeTRxUS80NXppRU1IZm8KLT4gc3NoLWVkMjU1MTkgNGhLQ013IGNy
-cS90WFY4WHpJVlFKTXlzcmFoeS9MdWh3VmZHVXR2aUpvN0YwWVZjMDAKR0lyQk03
-MmlwZi9xRmhjZ2Z1cS96Qk1jUkNxUm81eGtSY25CMFMvdVE0WQotPiBzc2gtZWQy
-NTUxOSBWMHVVcncgcWNtQjlLRDVLZ083N0JsbnRNL1RmSFY3VXNsTzNYU0pnQU1S
-eUk3ajNRdwoycUF0cWYwc0RsZllWaHZVbENCK2xqd3hGUzdqcmEyRzIvaHVPajds
-a3BZCi0+IGRKNWZcX0VqLWdyZWFzZQo4dEZsam5BCi0tLSBBY0dNVlBKQjRyK1k0
-dzJiKzBSeFptd3NmR3dFbEI4b3pDckJsVGZKbHpZCiG9gNEP3oljTwHLqU2iw2Wu
-kaId9vFOpmZQ3AvpLYvx9hXfEFHuWTmvVYfTSrmxbhSzwB5mQYuwvQWbPTIJt6Vf
-zkoHrMVj1gWGkXeKuwgDWwQ6sneZnInCR/D+WlAl7Hw+XSUPykpf9HrhUA0lBPtZ
-sT1Fa1vk1Q==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqalR2bGl0MmZIbVF1dDBP
+TytSajFiMXF1Wk9oRUc0YURoYUJSVlRSK2dBClMwcUZmKzlITVIwb1hFODFXOWFm
+UWdVNXd0MzdLSzZpOE5TSlEvZE5QU00KLT4gc3NoLWVkMjU1MTkgNGhLQ013IHk3
+Y0xWYi9mdUphZ3lBZWVsdWdSSGp3YlRVVzcyNTVJSDcxMkkyNGNnQWMKODdrKzJF
+TXh2c2NZTEx3bXVHU0pONDgxa1J0SUk0aUZBdGp6WmMvRjNTRQotPiBzc2gtZWQy
+NTUxOSBxOG9jemcgYUZoK1NIUy9JVDhkL0FWTC9CVzJBNU1kcmt6OTlJaXd0dVRZ
+NUZpTWp6TQp1bVM2cFZiNGN6Y3FwOURScGJJNUlLQ1Q5aGdvUTJLRE4wY0hwZWM5
+c25NCi0+IFonLWdyZWFzZSAzeDE4WzEwIDh6QEJzcW4gR3p7TzcKSHdlMUJiWQot
+LS0gREdXY0EyNVJjQklMc3ZHeWxHQ3dDUU5GejNzL3FOTCsxa28vYm9maG5RQQri
+jxEJWVKrCajeu6cLhOAtkyIy/6eNbhhTih+9+a0cgFv19Sq+m3/lQ6DwglPo146Z
+USJx2ispiPwWeNq5rO2TP8vme0oTOdqhT2eGjDY1anhr+TaQotIgMDqcfvG2zBeV
+6dRAbYDM+wv0raBGiBftdKnAxrJ8ICQ=
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/restic-server/briefkasten.age b/secrets/restic-server/briefkasten.age
@@ -1,13 +1,15 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNM1dHT1gweG1mRFl5SmV6
-VjJrUmRZanVreS9CWkROVWVOTGJDdVRSSUI0CmpJUEJtUlNBWGsrZXY5M0I4WkpK
-M2lBOEg2WHJWWGo2ME5LOXhLZDdqNm8KLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IDRs
-WDVYcStCZ3NJRWptbm9qN3lwaWZyL1NjVlNObCtqaWtVTGhndit2RmsKVXdPeEF3
-Sks0Nmo3YWY0YURSUXJTQkpQenVBUDVRWDhDRDlMOGZiQno3WQotPiBzc2gtZWQy
-NTUxOSA0aEtDTXcgTzFvei8yamsvQ0xxeWM5N0xtaTR0ckJWYVlaR0ZsaUR5RnJN
-ZXNNWmlFSQpjaWFZUzIxSDlmOGVzaEptc0pjQk1TdlJhdWFFT21yYmk4bFZvRDRB
-aVBjCi0+ICsuV1QtZ3JlYXNlIDhLeWxjMSBbbD5QVApTZEpwYWlnUXRHK3lTczI4
-aC9MWEpheHRORnFaTS8vNGszSW0yNU15UUYvMWxEempTdwotLS0gbXVScjNhZTJB
-eDMrVUhqY0k1dG8wWVArOE96NnhQN1llZVQvL0RUYjQvQQpvwkzm9IsSLl0eel0s
-Cd7KiBrODPG0iLYuTInAf5zaKD7Bg1INCO65MjCzLrQoRfAXjFprY6VCHYI=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmRzAwL3NhRENPdDNISjZn
+d3lqam5SUm42eG4xTWwzei9rMlhtOFNiOGgwCk8zcnhJQWx2a1FrcG5MNmlqTHN3
+a2E2L2c5VTZxTW16YzdlbVNOK01SbVEKLT4gc3NoLWVkMjU1MTkgcThvY3pnIEJp
+SkY2QU9CWXhzRW1QOFRFVUt3R3Z0eE5qSnlSRVMzc092eWxoSjJuemsKUTZLRURh
+UytlSC9RbVd0WTNwWi9iSENkNzBtTFBHajdNMVQwek9rVGR1bwotPiBzc2gtZWQy
+NTUxOSA0aEtDTXcgWFZ1S3FraGlkM2lORFBkaUNGMXFIZEpqeCtOSThmN0x5OEla
+UXVRUmhrdwpEeW9Nd2lDZ3prRjhJay84bXprWkgzY2lDTG1zdk1tL0F2QU9Ed3g3
+aWpZCi0+IH58UCtbLWdyZWFzZSB2SilXQjYgKGx9My9YJEIKM1ppQXVwWVVEYzY4
+WTZEMzJycjFIeGpmOTlPT2lIeWx2ZlVvTTIxa05LZFc3OXNxWWVycWRydWdpR0Zq
+dldYVQpac3lEaldrS3hFZm5jeEdZWER3ekM2aUM2Y1dpZm5qYVY1aEg1QQotLS0g
+dnJwTW9JUzNJMVRLMmo1b3BtZ2t4a21CUUlacnBKYmQwSmM0TFkrNVF6UQqAVOk/
+rd8UqCUAsKFeCiNp5zX50MFpUrHBkzAJsmS6O8hT94A3czw72dfF19R4ozKFE2TR
+hwfwvVQ=
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/restic-server/wanderduene.age b/secrets/restic-server/wanderduene.age
@@ -1,15 +1,15 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPZnA5RzFTTHp6T0kzY0pR
-eFIyN3Zha25HMG5aVXNJY3FWUU9OblMrb1RRCjZNTEdQc2JUWWxlNDlzOG9YUDJK
-aFN3WGRpZC9kMmJJY1M2K0xjTkdjYjAKLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IGxx
-dWlWSVRZU2h4QmZDWlhSQkNhNTg1OTNGek5VSXdtK1YzdjA3bGpMekkKVEl5NnlE
-bVhaN1dYRkJPUENpa1c3SDJRRzBiZ3FKUHhraXRqaEFsampKOAotPiBzc2gtZWQy
-NTUxOSA0aEtDTXcgTGNITk5BTFBLeTZwVmZNUDgyYXY4aEZJQlFiT1pYWkxSL2Vj
-S0gyaXdTNApiSnpMZVRyOVpXeU1PTElGNHRwTWhvZ3htYWd0Y1RycmpEb21yTUwr
-UitBCi0+IEdHRS1ncmVhc2UKTTVSazFPcng0RnhWSWEyQkYwbkxzRm9uY0NoeFVo
-clk3WWxRNmo5V3RGcTFzdzUyK3d5MVB2MHJjT0JTUC90KwpFeDBmUzVJYkZYdG5l
-MjQKLS0tIGx4alBhODlwYUQyZEJITjBYOGJoSnBGUThSZEQ3VjRmdGdLY3dTOUZC
-ZDgKawoqDvtdWdWR3S/NiMCZV65b47hI9v6HeRUGdH8gRYBP2Il70llY3pNHQy7a
-YNoVLxxWy5X8SUpWjUuZNGU+KJxNDX8grT+VzoKMabJfwuEDvddTddYXocgrH1NK
-XzhW
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3em40YlBGSkZHMks0VG03
+QnhaUVc3RFBlRHpIWFZHQTlyQ0M2U0hOZXpBCmdoL2ZydnNWdWxVSldjdGphUHQx
+cU9GVXRmS0tMYnk1QWZvcThyZXprL28KLT4gc3NoLWVkMjU1MTkgcThvY3pnIGFO
+aXZyVzVyczlLRjZQeWNSYnVOaElsMUJmY0xUN3BpL1RvYTVldGZaMUkKdVRoNHlp
+cjJ2YXdJUmg5QkhqMjJ6ZlNMbGp1V2N6WnBSRnMrZTZGc25NZwotPiBzc2gtZWQy
+NTUxOSA0aEtDTXcgOXlyN05GdDRrZ0ZMOUFSTzU5R2Q3NE9xTXRhV3NLYnpXOTh6
+TUVDSXpqcwpFMUZDL3ArdXk0cTc3eHRwR0h1QUZPS1hCTWZrSE1iY1N2LzlVbGEr
+STFBCi0+ID0tZ3JlYXNlIGVCYXl6JyR5IG47LSBMIERoNWswCkwxeWNmZTlOTHNT
+a203d3dOeWhabFNMbzJnK3A2RkxXZ2NwUk1wb0xSWHdkbmpuZGttWFJ1aDVRQjBa
+Yy9paG4KS3lTdQotLS0gZHZjZHZMZW1sVnJBakdhTUJtRTJXU0dFemIxekx6NXQ3
+SGs1V09VMXJocwpEEAO3SlZEJCknBeO/xINWrIsA9Zr/t7i+fJ3aqsFeWjf4gL7O
+K0XbqNmWUGInt4QL7fxQjXs6rrYSZfCS6QZmb4R+8SHsiVvtdpyWRVmlsJFq8cFm
+30uXcrY7ZLVy+EA=
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
@@ -1,13 +1,13 @@
 let
   leah           = "age1mn57hntgx775kwcwx4jrrd7rfl7z4wl54kqtgq8w2kzg7agz7alsv5eesw";
+
   blechkasten    = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEZLQ6jDcRGjUy7eyDHF0WHDquxGb6aP93d9w8trEZZE";
   coladose       = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP2ky7icnZOUMDtBPwVoq5icGFAzf1C5nfNhoqZEins7";
 
   #servers
   briefkasten    = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN8mi9ZKPdhn20g9gyxE7NYBq/vAKemW4lhaQlLw5QVc";
-  briefkaestchen = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP6TmPYuTFIVnLZx6MxnGcRkxC6fRuEqKlLQjMmQHHkE";
 
-  trabbi          = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPLBBZJ9/644d71E8A7IFU7dvDHI+OR/7q79KvqmI/i/";
+  trabbi          = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBwzDl1dHpDIZxFfRBLQyFn85RVTsg7OgO3Eahdn3FTJ";
   wanderduene-old = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEff3QkAesMYwquc49H5e2CjRH9Dv50/DjzqpCw97lPQ";
   wanderduene     = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH8uAvUnwhg3pnCdaaoclWDKV275SyNSyrkJON+R5Boi";
 

@@ -29,8 +29,8 @@ in {
   "briefkasten/syncthing/cert.age".publicKeys                       = [ leah briefkasten ];
   "briefkasten/syncthing/htpasswd.age".publicKeys                   = [ leah briefkasten ];
 
-  "briefkasten/influx/grafana_token_mqttData.age".publicKeys        = [ leah briefkasten trabbi];
-  "briefkasten/influx/grafana_token_solaxData.age".publicKeys       = [ leah briefkasten trabbi];
+  "briefkasten/influx/grafana_token_mqttData.age".publicKeys        = [ leah briefkasten trabbi ];
+  "briefkasten/influx/grafana_token_solaxData.age".publicKeys       = [ leah briefkasten trabbi ];
   "briefkasten/influx/telegraf_token_mqttData.age".publicKeys       = [ leah briefkasten ];
   "briefkasten/influx/telegraf_token_solaxData.age".publicKeys      = [ leah briefkasten ];
   "briefkasten/influx/master_token.age".publicKeys                  = [ leah briefkasten ];

@@ -71,27 +71,26 @@ in {
   "briefkasten/restic/syncthing-wiki.age".publicKeys                = [ leah briefkasten ];
 
 
-  "trabbi/matrix-synapse/registration_shared_secret.age".publicKeys = [ leah trabbi ];
-  "trabbi/matrix-synapse/s3_secrets.age".publicKeys                  = [ leah trabbi ];
-
+  "trabbi/restic/mail.age".publicKeys                               = [ leah trabbi ];
+  "trabbi/restic/matrix-synapse.age".publicKeys                     = [ leah trabbi ];
   "trabbi/restic/radicale.age".publicKeys                           = [ leah trabbi ];
-  "trabbi/restic/vaultwarden.age".publicKeys                        = [ leah trabbi ];
+  "trabbi/restic/ctucx-things.age".publicKeys                       = [ leah trabbi ];
   "trabbi/restic/gitolite.age".publicKeys                           = [ leah trabbi ];
-  "trabbi/restic/pleroma.age".publicKeys                            = [ leah trabbi ];
-  "trabbi/restic/matrix-synapse.age".publicKeys                     = [ leah trabbi ];
-  "trabbi/restic/mail.age".publicKeys                               = [ leah trabbi ];
+  "trabbi/restic/vaultwarden.age".publicKeys                        = [ leah trabbi ];
   "trabbi/restic/gotosocial.age".publicKeys                         = [ leah trabbi ];
-  "trabbi/restic/ctucx-things.age".publicKeys                       = [ leah trabbi ];
-
-  "trabbi/mail/password-leah-ctu.cx.age".publicKeys                 = [ leah trabbi ];
-  "trabbi/mail/password-vaultwarden-ctu.cx.age".publicKeys          = [ leah trabbi ];
-  "trabbi/mail/password-mail-zug.network.age".publicKeys            = [ leah trabbi ];
 
   "trabbi/radicale-users.age".publicKeys                            = [ leah trabbi ];
   "trabbi/travelynx2fedi-env.age".publicKeys                        = [ leah trabbi ];
-
   "trabbi/vaultwarden-secrets.age".publicKeys                       = [ leah trabbi ];
 
+  "trabbi/matrix-synapse/registration_shared_secret.age".publicKeys = [ leah trabbi ];
+  "trabbi/matrix-synapse/sliding-sync-env.age".publicKeys           = [ leah trabbi ];
+  "trabbi/matrix-synapse/s3_secrets.age".publicKeys                 = [ leah trabbi ];
+
+  "trabbi/mail/password-leah-ctu.cx.age".publicKeys                 = [ leah trabbi ];
+  "trabbi/mail/password-vaultwarden-ctu.cx.age".publicKeys          = [ leah trabbi ];
+  "trabbi/mail/password-mail-zug.network.age".publicKeys            = [ leah trabbi ];
+
 
   "wanderduene/wireguard-privkey.age".publicKeys                    = [ leah wanderduene ];
   "wanderduene/restic-server-htpasswd.age".publicKeys               = [ leah wanderduene ];

diff --git a/secrets/trabbi/mail/password-leah-ctu.cx.age b/secrets/trabbi/mail/password-leah-ctu.cx.age
@@ -1,11 +1,11 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHR0F0eU1SNEdnQTE2bVRX
-d2ZOLzJJekI3bi84UmNpdlNCUnhBYnV1MFVZCjB5bFd1ZVYyWHcwVzd3U2N3RytO
-bFNlVEhkQ280dk84UWNHcjhhSWhLOFEKLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IExi
-QzRicVBIeUFybkJOdE1hZEdyajFRN1V1d1BGSDRlVmpaWXcyR09Ud3cKQkExV0kz
-MHp2dzROWlNFcUZFSGNEWXNWNmhOV0NTTGlRZ2lpd3NJOTh1TQotPiAlPi1ncmVh
-c2UKeitLOC9mWmRwVUZjOHBzcmNjYwotLS0gSmdYTlVZYktmb1lSRG1nVXJBQUxa
-R1RrVDdBd3ZBVVV2QVkxYUFSd3ZwTQrgC8z3YCye5yEk+rFZvfjHkwDVP+0tfneI
-yqjiaIXuoJ9Cmlcf9ygwaEq0CSCrpCYQQciGxEn0lIu1kZJtQSoohM/0KJbjucMf
-MdFvNvUQExn2TUnmHIpPBqnpKGI=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkWjBVVVJtQVhwK1hFYW5s
+NjYrTUhPMlMzMDhqYW9QRFhjTVZMQ2RCSlYwCmFFSVVpbUgzVG9tRVBZOElwNzZQ
+V0JnM0RwSXF3bGZzRGhQTElTNkFEaDQKLT4gc3NoLWVkMjU1MTkgcThvY3pnIEtp
+ZFFUMnFYd214eER1MzFUd20zQWpHcU5CQjkwYk94RzErQ3F0dHB0SDQKb0VMKzhi
+SXVWMlF6Nk05Z3hMNmk3clZKSm1IaFBqTUk3S0JGazQraDRQcwotPiBCVC1ncmVh
+c2UgVHJFTDJaIGs0XF9OR2cKTDNvCi0tLSBaYlc2TWhxRDRIdWhaVW92MGFHZ3B4
+cVRNNXE1V3V2MWlsbUxrSHJJNWZBCm3luiXKMkvRHtzAwFfXhOFmsTq/+113C5fS
+YcITBCNjIJd4wYBHjp+heiiMM0ESTmuMmDb2P1oFyTC3jekvDTiXfo/RNN6ufUtC
+SbxzSY3kI6HstTLdxKbpmw6HdQ==
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/trabbi/mail/password-mail-zug.network.age b/secrets/trabbi/mail/password-mail-zug.network.age
@@ -1,12 +1,13 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4OGdoSUl4VTE0KytQMzI3
-eDJENkdINmVOZmVKWVdoS0RlZUU0ZGVZM0YwCjl1SHB2NEpwazU0a2ViZGpDVDFo
-UmFOMUZCVGNxY3ZvVkhOZzUydldZdzQKLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IFBY
-KzZpQkxjOWNXRHVWL1paT0h2d2U4dDZIQ1N6Mnh0T2pZZi9GUGx2M2sKRmg0VzlU
-RjFZWDdPWkhMRzNYOS90bFdqUzdVYk80M0pFclFEUk5MMFZQUQotPiBaOzMxJi1n
-cmVhc2UKWk5SK2NSOWxvNTZGU2xLbGlMZTcrSlRYYVZpSkdlMU8rUFY4ZjRISmhm
-TnhsbmFKdFEKLS0tIC9HRDBwQmIwODlpOWY3UExMd2prcnV6Y3hzVVEybktPcG5M
-aUpoSEVMbm8KinRoP/RE213jqWlkmPDhF91C8o1Qr1Gi03qiYFGZlM5wiztDkTxg
-Wz9SEv7o5fu43o1vJfgpxO6L6bJ0BqRRAqcOm3sVv4d2jTUh+fMLJ6Y++xig7ksI
-zri7ij2r
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnSm9MeVR0TWx1R1Z4V1l3
+aWZlWldPZEhzbDRmYjcxcmV0dmt6MVBMU1ZJClBVOTBrR1ZwVUUyTXNkWFVabGhL
+cXBOd1Rsc2ptQkszZnprckcxeEhjbTQKLT4gc3NoLWVkMjU1MTkgcThvY3pnIDJU
+empYQTRXUWM0SFBNOUE2MW1Xa25zNGw0MVdMWWw5U0pIeVZJbjBCU00KTEpWUEtP
+WVRLcDZtVlZibFVtVCtuSnBGM3hzcE1ZeVY0RVZHZ2JFcm9wcwotPiBbOD5dIXkt
+Z3JlYXNlCjJXaWpIU0VIcC8zei9NbXhvd0UvSWNpc3lnb1E2ekI0dkdQeUNVVlZn
+cGM0L25SSzFKbHZUbEJmMGpBektBQlAKdVlZZTcwUjFkQkxFU3gxK1BwVFNJK1h0
+dGFyeXZKV2NSaDFXUjdiRDl4ckRxL1lORnIyTkIyOE9PbFhmN0xZCi0tLSBDN1ZK
+V2JLL0hETmdKQU9GU2tYRGt1VHd2dUdjRHhWOW1nY1JEdEFmcEJ3ClzB8iIUYXsm
+mM5OwAb1ofJkCAIZar+ul8MNgdBTAanCEh1ToN9f1P68zWq83UjzpPIZRrfCPnH5
+3AIhVrJeQE1d3sITUYfILoR6t/b19r3NlSbQa18+ozrfQYhFlA==
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/trabbi/mail/password-vaultwarden-ctu.cx.age b/secrets/trabbi/mail/password-vaultwarden-ctu.cx.age
@@ -1,13 +1,11 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTaHkwOHpYdUlPRUUrOHd4
-dUxKSHJrcHl1ZzBkL3Jxb2E5emF1R2Y0bFcwCjJseHo1WHhCQkhZMjBNWDZkNW05
-Ky9yZXZ4WkN4cWJrVnJYMktnUWVSVjgKLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IFVh
-TmdRL2Ixdk1ESEY0S29RbnYyUkVkSEgzVGR5M1BWT20yNXNPWEp4QWMKa2VXY0Ez
-VU8wMjZJM0VkVGtoZUVsR2dCa0R2NFFwWEp4M2gwZkVZQzJISQotPiBpLWdyZWFz
-ZSBRZDFkcSBHfTQpOgplVlNyN2c5N2JhdDdoTWc2WTRBUmJxRzcxMGlIbitUSUNF
-L0NmeFlUTmpnZExZTzdMcFJHcUFZVDFzYll2Rk1XClFSSFEwRWtVcEsvQmtEMHBn
-YkVDTVZRRXlnCi0tLSBnZVowL1phWTZFYUxMdjVpRmQwekFDUXZkb25Ba1hDR0Jn
-dWsrRnl3b0dZCgQYiKNKYJ3Zksdz4XojgVuiMNZWnAgHdNAuLsgDZKeViB3UQI5c
-q70EoUo81QwQoxfRqq0cKs+kdXJ7GCi/uXgzVhMPAdkwON91bsKavIFs95cJAsla
-L2kdg42U
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1dCtzaFdjRlVKZnZUQS9v
+VDdFVWQ1QldCYkFsUHpOcFJpL0pKb1M4dm1RClN2RWVlbEIwbXJCOXdUV1duZjQr
+YUpxNVJ1Z0JqaXpCRUdvV2taOEJVVUEKLT4gc3NoLWVkMjU1MTkgcThvY3pnIC9n
+d0pwL1cwUEJsWDBHSjVPZHFmVCtNNlM0bkl2RlJWWmorV2VQSEozVVEKNmpwQ0la
+c3hyT2ZXa2tVMVZZKzhnckVXRWF4WjhPOGc3OGpJVGZhZURHbwotPiAsYEs8dC1n
+cmVhc2UgYlE6CjM0RFE1dFMwOVgzYWFOOEhpcjlQCi0tLSB2am1KUzhvUzBtU3VB
+N1NHSnA5MC94azA4Zm1OcmRGd29FWHJBTHNpRU93CkDUvBzbMctpZbWnn3cZJm96
+bsgw49b2WmKGy59sAVCQoQhf5mcKgB8ZeqgZw1+moPmYGhNtSzEVewJfWz/eXLwR
+9F9X5rjE+emBZxnLzAbWXSo5S6FZLE7Cf7nM
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/trabbi/matrix-synapse/registration_shared_secret.age b/secrets/trabbi/matrix-synapse/registration_shared_secret.age
@@ -1,12 +1,11 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaRHI0OG9jbVB5ZmFpUGpz
-blhscmtITkwzbWhMZGNqa3VqUDdjbmpZNEZNCktZdlZmNTQ2ZEhwOUc3TkU0NmV6
-WHJxclFqbS81Q0VJSGxScUZ3Um5NYjQKLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IHBD
-c1p5Y1ExRTFTYkhzK3VwYzdUamZKam0yZWk5T0FKOFhvUHhjUlc1Qm8KY01CVWhX
-Si9hSkxPMkRuQTNQcHVtNE9zTWVoOVMwVVJYWlZkdVQwVEd0TQotPiBtLWdyZWFz
-ZSBrCndCOUlYL29Ca2dFUXo1WE4yeVdTdzZZV3NYeGxSbUlsWmttQXE4TUF1QmJT
-SFcwZ0xOSkVrS044WjNqSU1FS3IKbGE1RFJLZ0hUZXZOVk1nbXc2SThCbVlYRUxW
-cWU1awotLS0geVRWTExCdzRBRmdjaXRWTVAzODYvUWhGQmlPYlZJMkFBc2tROWNY
-UG9FVQqMHjvhPGNLOAriKfuCaJsiU6Ekq6/eBWfv03K8lMT4l/9dUq0RFWbYjJ6h
-NPPh0I9nQ2hc1NlMaVZFLvrwedQ7tw==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtNjJwdmlKc1VCdit0RWlu
+U25sRC9ncWEyd29peEk4YU5CenY0K1ljYVUwCjU0cTZwSDQzc1kzclJNWDhqcVZn
+MHRuMFdLbmsxMDJRNWprcHVrOU42SkUKLT4gc3NoLWVkMjU1MTkgcThvY3pnIGlk
+aE5xakJ1RWVSWGE1RVVmTTREVkdOMjk5b1RvUWswaXJMd0ZHMHJQeVkKa1dUemc1
+MUhLemEwVXF1S2JxQWp0NDFGZDVOUWZ1cmRyaHA1RER1ampXcwotPiBZWiVcPilc
+Xi1ncmVhc2UgS3tpIEd5e2VeU0JMIDZvUkhxViA6bigyOApOZzM4YmtDcnkwRzJ5
+QXpvQVhDRVlDWkw4aWpDCi0tLSBDTnZNcEJvTm5xWks5UnU1OTlMclZ0TVNmb1Nt
+VDlDcTRZcVBNUUtMdGRvCikQTbQoO0aEvc9z8jQ7vvNXa0KeT98HNsLvIUuKYnlx
+hPoRTv23Ka9rHHnkLWHzqBJ5SsJtgOo4+2p3T5V/ejBT
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/trabbi/matrix-synapse/s3_secrets.age b/secrets/trabbi/matrix-synapse/s3_secrets.age
@@ -1,13 +1,15 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4blFsZ21yZ0F6eU45bE85
-RzJzaDAzdHhRZHZUUXlwUGZ5N0ZidE52SUZ3Cko1enJ4TUQ3UW9TUkNsZHVBZ3NC
-T3ZseExNc2hVZTlDekNHMWVucEtZcVUKLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IHdU
-ZTVKcEI5MXkwZ3Fwejlvcnl1NTlQbXIwdmFHbW0xZWZ4VUFBa0pTWGsKdStpSmtJ
-V1F1cXlHVzIyOVBtVUcvcTBFVnhQYTdRRmcxWUY0aTRuOFlscwotPiBkdzt0RiYt
-Z3JlYXNlIFlKV0J+IwpDbEM2UGdWL2YzVDhFQ1k4V0NobXZ1U2dFLy91MDFIQ2JB
-Ci0tLSBaaXV0SzB6dlkwTEdHYTRQeUtCMXA1b2YxVkk0ZHJqSGN6anlENVBRN0Nz
-Chj5SQiljRoqg3okaleuHbs9HKU5Q1qwsoKNhiuzo00KbnWncmehwodd1gFWinTA
-5Io+xqJ+sXJLrCsoxlVnZY20wZvt6MMgDRgp3XjWzWDc+csO7YrwvXAhgUYwJ5ea
-kRw2QT2R6HvU/p+DdN4NhJ8VraliqdE17V1YyhsEcUyOvb7cjt43scFVg1OPFEMH
-RFdkavOcSBGYsFXGE6XwafjNs9Q=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXSWV2UTUxK2RSalZ5VEdU
+NFhuS3hhN3JROGxVNDdLc25OM3o1TWZSOFFVCjJsN3dKYlV0TnQ0TU14UmEvMHds
+b1lYcmhDWnZDdkFtY2FTY2o1UGtoSU0KLT4gc3NoLWVkMjU1MTkgcThvY3pnIDh5
+S3V5K3cvU0VPY0ZFTEJoY1hqS3E3OWl0aFNhYWtCclArek5Qd2tHazgKb0haQllR
+UXlYamg5OE56NmpJcDZ1Qkx2dUd3MXMramYzYW82Z0dJaEFYRQotPiAmZSI9LWdy
+ZWFzZSB7JEpSQjYgUCAhWWl0SyhQbSArCklKVVArUHF6bGo4bnZTdTc1dVFrcHNC
+WlJEZmhMQVJEV3NtLzUwZmc1WmQzNUtETGlXMXFkT3J4SEd5Vm9jdUQKL0ZFbE9T
+ZURieE1uMUt2aUFvTkR6NmltM3poZlVpV2h4dTByMDB4WUp0WlhkZlZOK0RtU3VR
+Ci0tLSBaVzk3SHZnazFmNTczcVFmTjNURSswT0xDWnYzV05qNG9JbWFsUlhnQXQ0
+CvRFgDFtM7PEVwAulmFZiSNanf4bECQhlg1+7ndfXAaoNiL/ZW/Vf3I3cx38tXNJ
+rZOT/OxzkRsGbjNlfEpBh4ziezLrnEAi85cYdgIj/PeXJmbkBOmgLnj1XZ4fQ7g/
+N8vFXKaRMmaftqK4oeMfpwZf3b/LHuVQ1bwwsp4+hOeJgglhlxSKLNn4nBmTxK4F
+iKsBmL/JRhlpRaSEUDk6dowZ+Fo=
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/trabbi/matrix-synapse/sliding-sync-env.age b/secrets/trabbi/matrix-synapse/sliding-sync-env.age
@@ -0,0 +1,11 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiYmUxdmdQRFhjMW13OCth
+UVpJd0VGKzBDbDNCNS91MytGSjJWbzFDT1JRCjE1OFpjeFRyNVdQNUUwbHl2OHgz
+QzU1enlJV0VFY2NQeSs3V3YvNW1pa0kKLT4gc3NoLWVkMjU1MTkgcThvY3pnIGVK
+YkZlaUhZRXdQSk9CMTJwZUc5TVFmdHhMUWV2c3l2ZklNamdiVFpxUmcKS2d5bFNk
+aHdOVFprT1JzYk9Pb1NCckd3YW1KcElhUXRmcHVYNDNUcDAzYwotPiBjfi1ncmVh
+c2UKMmVrMHErK0dIMkJUdm9lNWs2TmxVZjJKencKLS0tIGxuMG1DOFdoMXNYNlNF
+dGFwbDdKa0F2eTdkVFN5V01idmd1cmxSVFlvMHcKe6Iy/7KSvhOi7XXIGQwRYCTI
+MdIr7KXqEczjvICgzcVeb+9pr19ESwoLABdELKftctM4uBdeoEXjTXM8AOlD+WEz
+Fkd0pGLxDYiHsWpVAOkeiqDFhI4uy1m1enmorYSiARXD4N3OtadgzuAFnusu1g==
+-----END AGE ENCRYPTED FILE-----

diff --git a/secrets/trabbi/radicale-users.age b/secrets/trabbi/radicale-users.age
@@ -1,14 +1,13 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKMXlWcFFZWGoyeVdCbGhH
-UlpXV0JFRWVLZVFXK21VbFN2elYyN3JjaENJCmI2clJxSW0vaERxVUE2VlR2RTZq
-ZVduMTVmSkhLWEpBNnJjY0NDK3J6NUkKLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IEdL
-S1NFbEFHTVc2RTNWWitDd3dLZGRiTzFLVHVBWENwb3FRN0xqMEk2bGsKR2c3blNT
-YzQ4bnpOMWhTM3E1dDlpeHR3UlEvQi8vLzdva0dpSGRBRnAzdwotPiAjdn5VSWxh
-Vy1ncmVhc2UgYCdlR1RRIVwgU1k7NiBYIntBeCMgZFVJVSV+bXMKZXJodE90UUZy
-ekNrOThTbWJhcXhkV1dGbTdpZUhYa0ZsdmR0VlhaV1pxZkN2YXpYRVlzMms4RzZ4
-UUZtWkxPNApIOXVUQ0l0U01YeVhZc0xzbWRMcGF3VUxweE1HCi0tLSBrTnJMby9w
-aVZ0YzlxY2x4MjFFWWd0cnE4a0xUbDFmVTlKNzlYdWFQb0FNCjHyhFf0N3SMWDeW
-Sj+ufoZReY9U7xtvKdu8ufaOYX2v+7c6mE+GlNOAXHmye7qfu4aMreMJQvYjpUj9
-ELXqgNjOgu/dUgWI7Y+L5E9GLCjRmD5KTdSQ7GcL6OVfY4DkhaI3I1+gsrH00jal
-nyfmB5wMUSwhF29Wx0oszOYQd/cDz+gxIU1SsEjGea7U
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCbXpDWC9wZ1ZabTh3bFl0
+TUJjRGV1UjRKUUduWmtuTDdYMVo3Zk8wT21rCkxvd21rUkVteGlCRGxIOU83K3A5
+akpQbXFEVG5LK3RqM09DTUhkVkRNV0UKLT4gc3NoLWVkMjU1MTkgcThvY3pnIDhS
+NVV6K1d5d3c3b082M1UyNVFlTTZMeC9CY3BlNEMvL1FrSXZxd1owQ0UKK1NUeXR5
+dHhPdENxY0p2RjNzRnlTVWwzVGpreTlnVlRFaVExczJ0VERnawotPiBLNyZmXFMt
+Z3JlYXNlIChXUUlDciB5KnogYlEKeDZxS2FoRStpeHp5Qnp0bG94TjN0MGorSjFP
+dzJGKzlJZ0xDVC9RCi0tLSAxWnhsajJCV21kWFl1anFDMGNvWlRoOU84eGs2TTRY
+c25VSmE3QmJFNStjCq8638TkeZ55Dl+/D8kwTBC/IzAcC8Qkn6GIoHt+i5Mdiz3q
+5Ls99UexhcEKfkC916HeVNqtX220ppdRPHt5GyxKoofnL0+UuxmmWwEwSawFSbfy
+doM+L0S8VRvz9USL6xrL3b9TmdhYq6vBW/gem/LGsSCf3bOxL+iCj7Xgwux8kTZJ
+UZmOocRqBQpm
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/trabbi/restic/ctucx-things.age b/secrets/trabbi/restic/ctucx-things.age
@@ -1,12 +1,13 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzM1dBR3lQVXdFMXdBOFdn
-UUU4cjhDYnNZYVBjUzVtUUNWTmE1OVQ5dGxFCmlleit4cHcxeHhQQThPM1Avd2Ja
-a0t1U0JSTzRjODhGUk1SUW9qRTBFaVUKLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IEhS
-RnRGbjRMaVJwcnpVTS8vUjBjRVdxSndhd1ltTGh3cU1hZ1NoTC94MEkKZnE3ZVA2
-MkNJbEpRQ09SRGlKa3lhUDBGcXZ6TURjTkVLTWNLTHE0OEtGcwotPiAkei5AbjAt
-Z3JlYXNlIHRoIFIgXDQ9c21oIE1pPCpzCjhKMWZReUE1V2Z2T3Bqd0VUT0prbzJL
-UndEZ0V4VjZCcjFZCi0tLSBxNldTdXAvcWNjRnZaV3NSd0hMVmZ4dndpQjdFWExW
-MVJjZTlIMFhVbU53Csqcr64Nr/PEjQq3a+NgnbmXt6w5gqhq8OvdCmXkqdgMqOj1
-qe1Z6PnZ/H30T65LtTfST2fVJkypliokh/JmizR1Zb+phDe+Em35igya5qlm30LZ
-yYgXbR6Uat7EWSsavg==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJMGw3T3ppclBzeUFScXNR
+ZC82R0FVbmo3TlZpWkl2cktkSDZKYmgzQkRJCkJYN1UwSnVocWF3bHpyOXJzVHpY
+Q0hwa2IyWE45R0gyMFdsWXR5eGpLa3MKLT4gc3NoLWVkMjU1MTkgcThvY3pnIHQv
+eDVybGxiNHlZRVU1anpsbkcvRkFiNVM3TFNoZGN0L0NTaWVOTzhDU00KT0JIMzJl
+YU55NDBMdlQrQXNxaFFCZ1dnN3JVeUJodDBtbElXaXRUYlNRUQotPiAyRjZbay1n
+cmVhc2UgYXggeEVRClVQNFJoOE1Dd3EzOHZ4SkRpS2U0N3BEQ0N0alRhbWFXQnVJ
+eDdLcWFFbUt3clhIS1l4REdiKzI3aVNSQnNRRzUKK2tIeTREZzU4VkNEU1Vpazg5
+eERiNlcxQWg1WQotLS0gWmV3WEhRakhVQk9tWXNpaUxGcnpTTktnTUZNbmFmT1JG
+RGdSTWdkL1pLVQq4F2I7xe8JOK+phCdvv1rCGqXsK/P8VZFf2hSj52ozT1kPoUSV
+KJg7+DHUM2V/nFOwtSCHuaabS3jt2qAHFx3NigKkptHv0rGbU9Jfkhz8Q8OEfWnV
+4UpITSm1nkkcO48=
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/trabbi/restic/gitolite.age b/secrets/trabbi/restic/gitolite.age
@@ -1,11 +1,13 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6M3hzOS9qSWErR0JOaXpQ
-RFN5NlVDN0V3NHlFMm52bU5XQlQxOHpZS1ZFCjhCSGtDaVh6STBIR1VWaXZaS1Zn
-MWZZQjVteVE2aVZBeDZqOHlhZ2N0bUUKLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IFZH
-dkRWNE85Y3FxcnhHYk9FRHhUZmp1T3FKWlNUU0RGSFhLc0FqeFd5SGcKeEpDK3hZ
-VjA2VkRWMGlSODM2VVB3QWxDTE54STF5b2h6OGRUNCt3WUdCbwotPiB3XHk9RSkt
-Z3JlYXNlIGt2SiBjKlJ8TmQgTDcgbTglfHR8awpyZ0w5U1RMSXJKdmVIeHhJL1lW
-SWd5RWRQa1Nxb1JUQ0xDdngvdTBQCi0tLSBFbUtGQ1dpc0Uvd24vSmQrVkZGenZW
-eTJQNCt3dGVRcFk4VlpMSHNEL1ZRCkq0Of7MOXPlfnDBDp45JJz9XZGKbMsxURKb
-WcXOVfgYEgSPSb4yviqL9yFS3LnAMljr8UTbwz45vF4=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzZG00YUpmR081NUUzMGE0
+Z25PRnZEQjc5TmJwVk8vanhobDdtZmxjRmlRCnpIdFFEMDJ0TVUveHIzek5nTU8w
+T2hpRUw0bVRSYU1ja0UyN2RBd3J6N2sKLT4gc3NoLWVkMjU1MTkgcThvY3pnIHdL
+Z1hOWk43VHhwZC9GL0Z3bmF0UlR1QndiRFZJa2ZvTnl0dFdGUVBzaVEKVDVIbG53
+dHAyYUIvYnRQaFM5MnV1VmxRM01rQUZxQm5YOWI2NG52WUVsVQotPiBtclgtZ3Jl
+YXNlIFIgWW4yUSBMMVZPe2M5NwpCRFJTYTZvQUFJUFJJOHhEL2t1UDlONHYwNWNu
+L1dXUzNrNUw4V3VzYUNqY1lWTTd3YVBTckpDNC9ialIrY3dZCkhwL2FJYzdrL3FP
+OW5nclpIVCs1cHJIOVBEQlBIc1RJNUR5VlBJYzB6ZDhCTDFvb1Jqc0JJZEovCi0t
+LSBzYWxXUEdpQVlEWit2Q1BhVXVRT3Q4VGJ0Sk1wTCswMkc2d2NKNzJtaDU0CoqD
+TxiIH0ODaByNQ1z+ouOmAiYNPG1l2+j6h/zSnC0wD2zhryRmIATc6joBWinLmZ+2
+A9BPmAYtg7M=
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/trabbi/restic/gotosocial.age b/secrets/trabbi/restic/gotosocial.age
@@ -1,12 +1,11 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1NExSYkNLMUZnVlVHTlNj
-SEFPZFVZUjZYQnRJSkFvWmFNRE1yYnYzYlJ3Ck5OY0NYRjZFWWlMV1B2K2tTclI1
-K3k2cU5McWRNZmpsRlg2dGtzT0NZY1EKLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IGR0
-WjlDdEt1YnlzWklYaWRmS0lFMnhkSTlLYjJvMlhyQ1ZqRmhQNkJqRlEKeHIwUmFO
-UjFodTlGd1FlNllnd25SbWFHemxHYjF1djBPckRVa2FFa2drSQotPiBoXkBQJC1n
-cmVhc2UgSmNmdyZgICZUCnRlL3F3K0N5UUVSMlJXK2NIVDhPUGlSdkZuTitHdEpu
-ZThNZW5HOHk1NHh0QjRQNUlKZWxtNitXTzFmYzlnMGUKN3prS0N6QVpQOWxxdjRR
-c0ZJcVdqQ3N3bzBKYUtjaU5iNWV3YnBIbwotLS0gT1gzNVBBYml2SW45WjJlRmFX
-OVVJOUx0dUxDMDhJZVdVcnVtaFVEbzgrVQo/zt/xvxlVCDrZQNRwvKXYawEFIIBM
-eHFmFgFKyS3Yh0k91ezuIQiUXdDSP2AEXHhIsd/ULqmF1X/2BLDUoUkIRw==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiTC9ldjJwTEkwb3c5K1FL
+SnRYYUZtUGtoSVpNRjdJTVd3SjI2MXI3ZGpNCkxybk13NGRuVDdONUpFc2h2Qy96
+T3BMNkpmbzFhVEtIYlA2Q2txckJGZTgKLT4gc3NoLWVkMjU1MTkgcThvY3pnIFhU
+MWRMNm85YWltTVpGZHNmVkNkZjJYZG5VWEYrK1dDNkRhNWJSM00rVEUKOGtneE8y
+aEM5cVdSdThoeklxZGZEWFRBYlVIdTJMWWI2NCttdDdVcWVHYwotPiBtQl8tZ3Jl
+YXNlIGYvOVsndFQ+ICpySCY4fmQKZHFtbXVBWUQydWJxV2tnOQotLS0gNHZKOEdH
+NUJvbU50YXBBVlNtNW5IZ2l6VnI4TzhEVExnK0NpSE9wWnQzRQpWV6a1s1gu/er5
+5XDiFemgTqQ5eA3gLh9c8nxAXPQXfsKmMg3w3rpX3KmfwfByjzNrSxxzIvWwjl2c
+TGBlccjgWw==
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/trabbi/restic/mail.age b/secrets/trabbi/restic/mail.age
@@ -1,12 +1,13 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCMmYxeEc2TlU4aGhtQTc2
-SnZEL1lLUDA0dFFTSm04dDl6cU14aHpoN0hnCjdrNmJiYXlvU2hMNU9oOUx4Q1NN
-YUR6b3dBYy81bngyRFNFTU9hMjY5b3cKLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IDdS
-KzJnUzZ2c3JkTXIwenVraUFHTkNRMkJaRkFVMFpVQmJwVzV3akRnaGsKM0xLYmZh
-UHdhS2JWVDRkSUw5bzJxRlN3Qml5VnA0UHhNQVJJRnBvZEY1YwotPiAhS3guPl4t
-Z3JlYXNlIFosKklsWyBULmxyIF9kXztTdyFRID9PST0KNGxpTTJZNjNvNHFpQm5r
-WklFWTd1T1N4bEZwb0Y4TzdjL3dSTHhTRmt3bmdieXd3SDlKRVJuVktNaktseUYx
-Wgo0dDhlNWJNcnBHY2tydS9TVkE1QXZCUW9yd00KLS0tIFg0YU9TZjdVdWZNenR3
-KzlSdUxVeXFCKzRvSmlrNUR6RUtmcFRvcHFQaHcKqrBW9RjM0vuSvaA5pCXZQjyP
-6jhjqrzc6YEqmAGKpHo1m9oTpVLBwaSqgrx1NaU2X1RDySQde6FQo5wlZY5lqKA=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtdGlXaGR6NG9VRkp1ak43
+a1g4bVUvdlNKdmxqRUZzWnZRUlBVWFZuT3owClhhdVVXcHpXYUtEQUVVOXZaWVRo
+R2lMUUtlOCt0OXBTOHk4OU0vdDVaSlkKLT4gc3NoLWVkMjU1MTkgcThvY3pnIEYx
+MGVWLytUOFJEUjFFbm5raXNFcGp0N0o3TDJBVURGY0pCTVo4TlF1VVEKNUNYNkRt
+T2dYS1Y5WGxjMFJ4OUdmTytLcmFPUVVySlV5N0cyTm9NbXg5TQotPiBTbnBqJ24i
+LWdyZWFzZSA7RmNnIE5CTjxzSSBNQCUiakEKQyt6SEZOZ3NHcEp1OHRQbXc5NlFx
+T3BsWlZXRzFMN1FvNGNJaDlhVDdGYXQwZDJ3WkV6YmR1ZjA2TXVGZUx6bgpMWXBD
+czUrb1BieFFnK0FqUFJCQU02LzdScktjZlhJdHlHR1FZRHUyT2c5RwotLS0gWTRk
+eHpHSEZra1UrS0tnRDlJOGhzQmdrUVcyWHpCbWE3QU9XT2pqQ253SQqoe//e4Y0O
+iHgzTbZXyr8Nw8eYReSzeSTX8IzWtlONoSV7fZwZOm4FrPTV9yxgwe6tjPYPm6kD
+L6j9b+c84bO+uA==
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/trabbi/restic/matrix-synapse.age b/secrets/trabbi/restic/matrix-synapse.age
@@ -1,13 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1bUdNMkZhRmkwaG5BVmQw
-ckh1WjVXcHd2L0lSdWlGNjlaRHNaRWZxaWw4CnZCTCs5VmFEb0FWcHFYMFBGWGpZ
-MCtPOFkxN2Y3OW9YNmhjd3ZiK2gzZlUKLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IFVL
-ZTJhekEzR1A5YmkvQmx2aVpDTkRXeEVFR2JNM0ZZZ3oyczRlRHJDSEUKbXhWcUQ5
-MTJaekJvZ2p1anNtbkZsTVh4SlpORDdPV1AreG1lQmRVbU1FOAotPiB9cz8uN2J+
-ZS1ncmVhc2UgQGBuKkpxPyBDYGI9IDsvTUYxIGlUR0ptRUEmCjBqUzBHWjBBeE1v
-ZU5iQmZmTEhTcVdpWEQvYWVzQW9ycXpoZUg2dlU2bnFTMGNsc3YrOTIzcFBDZ0I1
-MlF5cnUKR1ROdlRmRVIzVkZ0R2lLVkw2T3l1UUlDUHkvcGhXdVJ5c2drRWY3MG5z
-cVZSZDEyNk9RNGFJa1RJMkdlLy9wRwpzTkIwCi0tLSBBcldqMGxkV3IwRUZhNWly
-bEY0djZmZVJ0MTdpOHJjb04rcjRISzRVZnZJColIVDLaRhKoXNN3w2azmTo7cUwM
-fOv3qkL/jEP77URrjS1GDBfX+gUs+M+YSskrWKheTw5Jzd1lrmI=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGQ21PTkcxbDlieWZWVlUx
+U1Y3T3gvWTdMT0tPTWVFdzhzTXdXdmFzYmo4CmxsekJqVHM1RmNJVklUL3ZVWTNI
+OHQ2aG5IRkNaODNiYmhYMVNNNXlDVk0KLT4gc3NoLWVkMjU1MTkgcThvY3pnIDhZ
+M053cjdPMGdaOE1rY1lSSklJOFYzUWM0NFVvZWVaOWpaTVFDMFdtd0UKUS9OQWZV
+RldEaC9Rc24zaURRcHRlWUdHSEpHclFGRmJZWjJNSElRZG1qOAotPiBeaUFtIWRF
+LWdyZWFzZSBgT11DbEk/WyBlPnt9bWEge0gge3B4TVYzfl4KdXhaRHZqZFJpVzZL
+ZzhlZGFqaXBvYTc3SkkvZVo3ZkJoQXl3VVRxT0dlWE5BZ21uU0FZbDJUV1ZWVkk1
+ZTIzagpjNXNIaHcwS1AwSm9NSHRtV2hmVW1aSFV1QWp4M3cKLS0tIE4yRmpYVUcx
+MUEvazMxd1dwZExKUnQrSTJ0RFlpZDNCMUltMytZMUlVVGcKfR0wBbp649MauNFV
+QPoHVQ6Uofme9/ogS1lZShgRioV4z7AfNhkvSuPZ1CuaV3rp3QHH2qgRZOlAiA==
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/trabbi/restic/pleroma.age b/secrets/trabbi/restic/pleroma.age
@@ -1,13 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqYjFWVUk2dEYzY05wWWt4
-RWlhTmxTTUFtZEtVdVVJRm9yVWFBZC9qOFR3CkFWejkzYXYzbE1QYXBhbVd3QlZ6
-WEZ4dUszdm42cDB2RVF4ZjEzZ2hvdjQKLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IFV0
-WUw3cmtTQUNJQWVQdGRYL0JhaGlJNzhXaVd6MHdQai9iSi9DV0l5SFUKZVBibll3
-aXMxVHg5M2hCUTFPZE9zOGxTaDdZZWFGb21iZTR4OTF5TWhiZwotPiBcbiwiMi1n
-cmVhc2UgL3Z+MyBGSC5LVVJNCit4TlBVZ2lmcnVDaTdaMTc1Q1lYUUNHVXAyTmgy
-dG8xNUpsU3QxZGEweTBzZTViMnpPOHBqV1FZYjlsei84UkIKc1lYaktyR08yb1ZW
-WWZRa2ZVS2VmZ2VCekloaWpxbjlXRWNwVmhaVnZ2cHVUalFYcEEKLS0tIGJScmlt
-dXFJcGU2eFcrUFIxYkxXeWZieFR5ZDd6OE83Q3V3MTJab0dya0UKkBSVv/RCm8E7
-SLy+PMFnVZeYOYA+7/UvVcawp6tzINi7UOVboO3vhGZQTVF5ZL9IpR6iwSgV0wYk
-dw==
------END AGE ENCRYPTED FILE-----

diff --git a/secrets/trabbi/restic/radicale.age b/secrets/trabbi/restic/radicale.age
@@ -1,12 +1,13 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqNUoraUlEc25DOVhlZE8v
-c29Sa3hSdm54Tk03VytRcHQvSDlJU1NkQm04CldMMmZMR0x1SWNiUXZmTWpmdHRp
-M2kxVUNaTFc5TGpvRTNHajlKYTc1cVkKLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IGJv
-MmEvdFJWQWNVWHczV01qTFMxbmY2SFRrUGVadWtQcUtld3IvaThIelEKUjh5TTZo
-UlF5OGt5WXhjc1dpMjhRMVdpM2RFanZ5ME9vR2IveWlvUzY1WQotPiBjSjk/TDlt
-bS1ncmVhc2UKRjV4bml3b21HUEFicWNSOWliaHpJTTg3NGpFdml1K0h0aE1nL0dY
-ampuV3U4WDFuaEY1TTQwdGtWd2kyRjdaNApVcFZ0WTM5akw1UHJVSklVY3hxOE1J
-RFZQS0lPZDhlSDlzOAotLS0gVTNNTWd5SDdaaklHYTBCSmNMekhhdDlScU12VXdZ
-NFpzb2QyQ3VaUlZpawpEpWWWDYN8iF/Sso1YTOS10PsCxc7g7Swdwq1j58I6YinB
-hIvLl3vF4X1fzLZmNO0DuLmb2iSAsrna
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFTU96QzdZMEhwV2x5aFZw
+UER4aGtVOHdycVlISFJmUnBhVU5NOGdxb3hrCjBVbWtoc1NUOHlEcW11Z1ZtZzd0
+UXpYeGhqV2ZHdjJOUEM1UG9DNFgxemsKLT4gc3NoLWVkMjU1MTkgcThvY3pnIFZK
+TDBySHNCYU5QUUdmR2tkSUJmVFpTcHBZNkVWemhwaGVLdit3aU56bE0KeWw2d0I2
+SWVzVGh4UDBRd29qWVZtZFB0U3c1d3lXRTMzYXZianRVbjRsMAotPiBVVCJvflkt
+Z3JlYXNlIFggRTt0ZFp8biMgcm18JCVQClJOdkdUL2dQdjBSZDM1bFRaOEJDMDhy
+WjVTMXp2aTRqZnUzSCtpYlVETldJaEI1UEFZR1U5Rk1xS2E4SWtvaHcKNkRnSVV3
+YSsxZklTV0ZNWVhnekVLa0hzT3lMZ2RNR0dENE1RN1V0cE9qZ2ZuSkNieXcKLS0t
+IGdkVytrUUJ6RWxlTy95bUhhR1Y1VXdOUm9XOCtLRDUvVnJsM0R4SHdpQlEKjfOY
+7kK837nVP6/pzvAXpwSV8V0c8hKQw6FyAIu5C9g1et/Xz6frBP627HdBpJ4Ged2B
+099BbCUeJQ==
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/trabbi/restic/vaultwarden.age b/secrets/trabbi/restic/vaultwarden.age
@@ -1,11 +1,10 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3aXlZRHdWbWVucWxDbU9M
-MjdKNUhKRm5vT0VBQ2dtbGxaSjFTWE00b0NZCnRCTFBabzBsMEVuK0FPS1ZjNHp0
-YUhUNStYKzhqVVBKRTNmUC96Z1p0UzAKLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IE93
-eFFxVTE4NkNTcW00dkEwN1FrclhBMHpHZ1QrNk9FZUVlQmVkN0tlbDAKWW5qR2R0
-ckRCd3Bwd2RZaVpudUR2OEU3QWlmSmUxYS9hMVd3VjBSYlpKNAotPiBgLWdyZWFz
-ZSBlMjNqWS5eMCB+IHoKVkdYbHliMlNhOXlUQkNCUXNPeHZRaXl1MzhBTkpMS0tR
-empYZFppRUtXa0JyRzlnVVVGSXFBRm9rVVByR3hDbAovY3NRMXFwdE5PWTMKLS0t
-IGoyeEVwQW5FVy9PdGdldTRYZUlKUkwrRVN1dXJCQWl1b2svWVE4RElqY1EKgIgf
-Z3las+5EMvEq5e1lU5wFGoVFXRSxsxU/kknJY33avmHzXovRW0vE9XLcWegr
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFa2NwYVJPWTZtZ3hVTGRS
+cUhPWWZ6Tk9YY3Z0Tk5RTFV0Ujk5NEoxa0U0CkJyTDA1QzBqU2czTFJCa2JPNWVJ
+M3RiNGYzZ2o3eDQybDR4enRxdlR1cWsKLT4gc3NoLWVkMjU1MTkgcThvY3pnIFNR
+bmIwckxWTzEwdUZsTjc2d2ZVOXNNcngyb0VjMlIvRDB3QUNvMkE4WHMKT21IdkE4
+ZWxQSWltK29CUHBFc213Z1VtNDhDaEYvZzFIUGNGUDZKeXJvdwotPiAoITVNSiw2
+LWdyZWFzZSBHKCBiblQ0L0YpJApHVE10VXBaK3J6RCtiblExQ2dRaTNBCi0tLSBp
+V2N5WERDejR5dU9iSDVMRzNOT0RVY3hqV0xwaGJMdy8wTHNRUC9zVUg4CrukbHSx
+F9HVeo+Dd9s7aFb1CaickbIy6GNLbpfYMGB1A3MSSX5GKP0KFOWt9hGPUw==
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/trabbi/travelynx2fedi-env.age b/secrets/trabbi/travelynx2fedi-env.age
@@ -1,13 +1,14 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOVFFGSG5IYVJPblJZemds
-VFNoK00vZmZDMHBYOHhzamhzU0JvVGRGZTJRCmhJVVVWYUgzTkdMYUlRY1VhZi9D
-ZHJiSHRseHV2RklsODBxV05Zd0k0VmMKLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IGQ3
-ckN2THNvdWtJbXFYSnQyd3dUWmZSVzI3QUdLM1RhS1lyMzREdTYyRzQKaXpJWHFD
-ZGdMMUJTYU40UjluY0RKQkZMc1MwVWJrelh4RUtlWmRVYjB3awotPiBAPlktZ3Jl
-YXNlIFQ5ZHBvICxlR2tuQz9yClVqNmdHSG9talcxS0FoZU8wWEcvZ1ZycVFLTTZM
-alFuZ1ltTE1wTDYKLS0tIEFWOTF6ZkI2SDFHK3FwdXVNaTBjWDhhcWZuQTFDQlc2
-cC8zTzZqY25lTFUKFe90bgb9T+eKbCp2P96+orgSnGw6Y1V335eu3j/tBPniyc0G
-vz/UiY6S6YZROYD1J5yHXIEjG/TBT8aqJqlu5LFodRNXZ/mAzOw8yyHejageedNY
-EFLz5QftnmsYLOzQpIaL2Cl+2PuiWkk2EXSTgQSUt1t3RbjONC8hNDdHy8MyJFQN
-13V1grjnwDqFpWa14T6ONCJ669vbd3tM89FnbmfA3A==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoMmxFaUVyTWQ3THVKTVVT
+bkNKM0hwZzVBb1c1L2E4TTVFSTA0L1BYM21FCklyeWJmUFQyKzdoWnZ3WGEwRktG
+YTk5WjhnQmtpT1lxN3NJT2lhVXd0bnMKLT4gc3NoLWVkMjU1MTkgcThvY3pnIFdD
+SkRNN2dQbmN3ZG8vNlI4S1JPSnhpZE9FT0IwZGRhUTRQblIwaVpKRGsKRlVEMHFk
+S1dZRFFXZ0ZnWlQzam4vZlF3N2lMKzlpN2hOazFsOGpnOENYQQotPiBEcTQ7NS1n
+cmVhc2UgKGVVS1dXciB8WCE2a2w+UQoyODkyOTl1Q2ZUbnpNd3FhbEtDZW9WU2lt
+Wlg3cVo5MHRJejFobUQrZ0ZlZEJGVERmRjFqd2RlQy95aGVsb0pWCgotLS0gZE5Z
+cmtlaWlmdkJBZy9JcWtkS1FkbFBrUXdhamRzUmxPTXhnRjQ3aEh4SQrfiOKLkIRc
+mKNIJtqoADXJpUIjwzdJdODLipnWPEtdHqHbRMq7R940JPQ+F39UzGgSx3K2rLm/
+sLR3WpfEomYmwAzpp8u+XIRBCr46Cqge6ikTVtprGQ8OME+cP9pDDVMj0Hez879j
+6qTJuAF7ibVfj7bkkZDfbLVumRQIt6UyvmqySPCDBKCwEgz4bbrf2El4x7cff66q
+vxwMMEkerHnlYrs/
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/trabbi/vaultwarden-secrets.age b/secrets/trabbi/vaultwarden-secrets.age
@@ -1,17 +1,17 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKM01mWFpOZk94b0psSUxx
-QnlYR1JEODJWZE96QkcxaUxCalluT1hpVkY4Ckdnb3lZZEdmQ0haRTdVYTMyQ3R2
-VTAwbFNYSFUvcmQ1Ym9hL0ZhamZwazAKLT4gc3NoLWVkMjU1MTkgVjB1VXJ3IE92
-MGY5U3lsWkZOMWV3Q3hXZEhSbWZKOHY2cVBabEdUaW5nYjAxWFZTbTgKTzRSZGdZ
-cjl6Rms5T083dkc4NEhVc01iTHExY0NKcEhxNjVkLzBxeFJFZwotPiBEJi1ncmVh
-c2UgPmw5dzggNi9TflFfIHxTCkdTQW5oSlVFSlVTekhEQlRsMEpFUld6eHZNdXk0
-Z29xc3VIVkF5eERKQ2ZDWDA5ZS9pNnJBaTVycmpBZXA3WFoKZ1pFUGo1dGo5SE5N
-VG02SVdvbVVCajAKLS0tIGNkWjVSL09xQ09LYjBXaW4vaS9FbHkwbmlReWVsdWth
-aXVYWEtwNzVhQkkKMVw/vLmH5bjPmgKyFf5xAAtkC4hDuvV62+ZVwocNlHzIk4V2
-tl3EKz7MgLYrQIuP7R7doBBqs5o7IKcToOziAW52B4NHO++7JghAdxJDYWJH/CTN
-QUYIVjYj/fg60y9EDvP7fEXBSfnM+IfURPh8XuhZYweAvcMe7IEeP7Zf0RY92HqT
-3IPzf+NwaYHeIaiJs0TNmRraxL/tN/oNqjgQc12HE/SEUnurhu6qxQSXCDF/uSB7
-OEWxTmUVl7tTyK1t7q/nNXOWELfqqjmyCpdGjyriTDvlD2MZrg31oUbHLnD3HITe
-0MRhvcJHOLYOOqoFugnFH0+kZDQPkrTzLjM/Gc1+7yQD6waIbOnWYIifZTHE1YN9
-V266nK/NpxBk4vevjRU7y3w92J3iETPjyqPwIvNnpw==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2L0g5cThDeWw5bTFuODlx
+OG9zaDNuOGNYbVp2a1dqY0ZPcFdqTGs3K0ZjCkFsZUZxY1N6Vzhjb1AvdjVnWVhh
+cExLaFoxbDJkU2wyM1RvZ3dySzAvZm8KLT4gc3NoLWVkMjU1MTkgcThvY3pnIEdX
+dVZKQ3VBVW9PaGFxRGhGK1JucFduOHlCS0tjRHF0L2FmdjR4ZXJxVFEKSmhsTEp0
+azVPYU84dVk2Rzg3NFF2Y1JGYVdYajU2ejg2NUROZUlsTXpsQQotPiAwd10tZ3Jl
+YXNlIH1gWzNZCmdhZk5FYzVnSDdCRTBCc2xpeWNuNGZaZlBnZk1rRzJFZVJUVHhB
+QXZVK0EyY1FrbjRlMFlUWUVWNWdkU3Uzbi8KbG1NWEF0Zmc1Yy8wTlVKc056Wm4z
+TGFqOUx3N3dDUmFGYjhxYkxrCi0tLSBwQ3crZ0h6d0RiUXhCMXphTHI5bndyMm95
+Nm8yeW90OGFWaUhrK3ZDTzBjCtYOmi5qEUi1Brb4jQZoiBFfBlpqNBJpEbpSmB71
+Rwfq686KbPDCLxWkt2q04feITmFREGTcEywojJBewlbrm3KbOV5aHR3d5x92BzEw
+jcs9R3NOKeDQFurE7pqdoFq+953n9YmXN0gzh11EKfB7eZy0R1/IWYvLeMXS6Zw9
+O+XOpHn6EmCRgqS8aziffacKB0wzVLTP/5T5D6jMFuH1JImQKw+R8pcu4GYVRzW8
+AZ2sNdZd3aPU/RavajkOsRkYrxx/xCCPxA/UJYzU9NdOjW7VQ23QAsus6lxRf3zE
+MRaLrW/ZlWpHuwEVKaKEO2luKD9OGC3qiAXzDeOF449JqODuC7c38CSZsIGHDHEK
+WY5Bv/a/jbgbi86+e4PV5VD9umjSLBFoPOMDHYmTz1rdc/E2sTM=
 -----END AGE ENCRYPTED FILE-----