ctucx.git: nixfiles

machines/lollo/websites: move oeffi.ctu.cx,oeffisear.ch here

diff --git a/configurations/linux/services/dns.nix b/configurations/linux/services/dns.nix
@@ -12,7 +12,7 @@
       SOA = {
         nameServer = "ns1.ctu.cx.";
         adminEmail = "dns@ctu.cx"; # Email address with a real `@`!
-        serial     = lib.toInt ("2022" + "09" + "14" + "01");
+        serial     = lib.toInt ("2022" + "10" + "23" + "01");
       };
     in {
 

diff --git a/machines/lollo/websites/default.nix b/machines/lollo/websites/default.nix
@@ -10,6 +10,9 @@
     ./photos.ctu.cx.nix
     ./flauschehorn.sexy.nix
     ./wifionic.de.nix
+
+    ./oeffisear.ch.nix
+    ./oeffi.ctu.cx.nix
   ];
 
 }

diff --git a/machines/osterei/websites/oeffi.ctu.cx.nix b/machines/lollo/websites/oeffi.ctu.cx.nix

diff --git a/machines/lollo/websites/oeffisear.ch.nix b/machines/lollo/websites/oeffisear.ch.nix
@@ -0,0 +1,80 @@
+{ config, pkgs, ... }:
+
+{
+
+  dns.zones."oeffisear.ch" = (pkgs.dns.lib.combinators.host "195.39.246.41" "2a0f:4ac0:acab::1");
+
+  users.groups.oeffisearch = {};
+  users.users.oeffisearch = {
+    isSystemUser = true;
+    home         = "/var/lib/oeffisearch";
+    group        = "oeffisearch";
+  };
+
+  age.secrets.restic-oeffisearch.file = ../../../secrets/lollo/restic/oeffisearch.age;
+
+  restic-backups.oeffisearch = {
+    user         = "oeffisearch";
+    passwordFile = config.age.secrets.restic-oeffisearch.path;
+    paths        = [ "/var/lib/oeffisearch" ];
+  };
+
+  systemd.services.oeffisearch = {
+    wantedBy  = [ "multi-user.target" ];
+    after     = [ "network.target" ];
+    onFailure = [ "email-notify@%i.service" ];
+
+    serviceConfig = {
+      User                    = "oeffisearch";
+      Group                   = "oeffisearch";
+
+      WorkingDirectory        = "/var/lib/oeffisearch";
+      ReadWritePaths          = [ "/var/lib/oeffisearch" ];
+
+      PrivateTmp              = true;
+      ProtectHome             = true;
+      ProtectSystem           = "strict";
+      ProtectKernelTunables   = true;
+      ProtectHostname         = true;
+      ProtectClock            = true;
+      ProtectControlGroups    = true;
+      RestrictAddressFamilies = "AF_INET AF_INET6";
+
+      NoNewPrivileges         = true;
+      PrivateDevices          = true;
+      RestrictSUIDSGID        = true;
+      ProtectKernelModules    = true;
+      MemoryDenyWriteExecute  = true;
+      RestrictNamespaces      = true;
+      RestrictRealtime        = true;
+      LockPersonality         = true;
+
+      ExecStart               = "${pkgs.oeffisearch}/bin/oeffisearch";
+
+      Restart                 = "on-failure";
+      RestartSec              = "5";
+    };
+
+    environment = {
+      PORT       = "8081";
+      CACHE_PATH = "/var/lib/oeffisearch";
+    };
+  };
+
+  services.nginx = {
+    enable = true;
+    virtualHosts."oeffisear.ch" = {
+      enableACME = true;
+      forceSSL   = true;
+      locations  = {
+        "@api".proxyPass = "http://127.0.0.1:8081";
+        "/" = {
+          root     = "${pkgs.oeffisearch}/share/oeffisearch";
+          index    = "index.html";
+          tryFiles = "$uri $uri/ @api";
+        };
+      };
+    };
+  };
+
+}

diff --git a/machines/osterei/websites/default.nix b/machines/osterei/websites/default.nix
@@ -5,8 +5,6 @@
   imports = [
     ./ctu.cx.nix
     ./ctu.cx-bikemap
-    ./oeffi.ctu.cx.nix
-    ./oeffisear.ch.nix
   ];
 
 }

diff --git a/machines/osterei/websites/oeffisear.ch.nix b/machines/osterei/websites/oeffisear.ch.nix
@@ -1,80 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-
-  dns.zones."oeffisear.ch" = (pkgs.dns.lib.combinators.host "185.232.70.80" "2a03:4000:4e:af1::1");
-
-  users.groups.oeffisearch = {};
-  users.users.oeffisearch = {
-    isSystemUser = true;
-    home         = "/var/lib/oeffisearch";
-    group        = "oeffisearch";
-  };
-
-  age.secrets.restic-oeffisearch.file = ../../../secrets/osterei/restic/oeffisearch.age;
-
-  restic-backups.oeffisearch = {
-    user         = "oeffisearch";
-    passwordFile = config.age.secrets.restic-oeffisearch.path;
-    paths        = [ "/var/lib/oeffisearch" ];
-  };
-
-  systemd.services.oeffisearch = {
-    wantedBy  = [ "multi-user.target" ];
-    after     = [ "network.target" ];
-    onFailure = [ "email-notify@%i.service" ];
-
-    serviceConfig = {
-      User                    = "oeffisearch";
-      Group                   = "oeffisearch";
-
-      WorkingDirectory        = "/var/lib/oeffisearch";
-      ReadWritePaths          = [ "/var/lib/oeffisearch" ];
-
-      PrivateTmp              = true;
-      ProtectHome             = true;
-      ProtectSystem           = "strict";
-      ProtectKernelTunables   = true;
-      ProtectHostname         = true;
-      ProtectClock            = true;
-      ProtectControlGroups    = true;
-      RestrictAddressFamilies = "AF_INET AF_INET6";
-
-      NoNewPrivileges         = true;
-      PrivateDevices          = true;
-      RestrictSUIDSGID        = true;
-      ProtectKernelModules    = true;
-      MemoryDenyWriteExecute  = true;
-      RestrictNamespaces      = true;
-      RestrictRealtime        = true;
-      LockPersonality         = true;
-
-      ExecStart               = "${pkgs.oeffisearch}/bin/oeffisearch";
-
-      Restart                 = "on-failure";
-      RestartSec              = "5";
-    };
-
-    environment = {
-      PORT       = "8081";
-      CACHE_PATH = "/var/lib/oeffisearch";
-    };
-  };
-
-  services.nginx = {
-    enable = true;
-    virtualHosts."oeffisear.ch" = {
-      enableACME = true;
-      forceSSL   = true;
-      locations  = {
-        "@api".proxyPass = "http://127.0.0.1:8081";
-        "/" = {
-          root     = "${pkgs.oeffisearch}/share/oeffisearch";
-          index    = "index.html";
-          tryFiles = "$uri $uri/ @api";
-        };
-      };
-    };
-  };
-
-}

diff --git a/secrets/coladose/syncthing/cert.age b/secrets/coladose/syncthing/cert.age  Binary files differ.

diff --git a/secrets/coladose/syncthing/key.age b/secrets/coladose/syncthing/key.age  Binary files differ.

diff --git a/secrets/currywurst/syncthing/cert.age b/secrets/currywurst/syncthing/cert.age  Binary files differ.

diff --git a/secrets/currywurst/syncthing/key.age b/secrets/currywurst/syncthing/key.age  Binary files differ.

diff --git a/secrets/desastro/restic-server-htpasswd.age b/secrets/desastro/restic-server-htpasswd.age  Binary files differ.

diff --git a/secrets/desastro/restic/syncthing-audiobooks-orig.age b/secrets/desastro/restic/syncthing-audiobooks-orig.age
@@ -1,10 +1,10 @@
 age-encryption.org/v1
--> X25519 2Ohykc1X+ejidmU6Z5app47a+nf+xS9+r/hH55Mo9yM
-0dDO7jGk/qvSsY1oKfPFUKEmxQ7gVOibr6+/aRAfFVk
--> ssh-ed25519 VgQ62A SgRMh6xS27IeB1jn20P86P7Tr8smFpY8af27iROZKWE
-Ah8pv9bd48TWL9VJM+zObg+xi6UKr3c5NO/4G4ZbFEc
--> 6D,an=o-grease 0g`RE .]09(E wO3[
-WAoBTVkcjXKlacRZfOcc3D7IF9/s/m7qpAZI03TQV9r9kak
---- qJ4y67ZERQFAUhz5arse9xRklNErXn1e+mT9I8wv/w0
-_|12���
-7@p�5-v7@�Te&>ʭ�����K��m|�ܵ�ɻ[Z-
\ No newline at end of file
+-> X25519 WZrmqrEAOfAyupXXciTvOUgwKjhpoZyaMqi9jFqU3Qs
+8RXXU1/oLtl47xS+pAj3s/OrVkIHh4Kjgq9kzAOuU9g
+-> ssh-ed25519 VgQ62A 2/tih3Mlhj7xTNGjQXU5746dpG8uDkhCYODTYgafoWw
+W6mfeMuHGTx2AMRZy0L8H4Gbdpc3bviHIaqM+JH6v84
+-> N#-grease #V Q'o
+MBicunTkyYLnXcLBzQuql3lC927/yN8EH4r/QJErwfc4iRO6n7gjPpBMv3r/U8z9
+ushlhHAs5CS1H/ROeT6/osC7hCPBUtWkKgQjtFBzXDPuCTI8
+--- KQCmIUmPQZSMZdhJJqkCDLNtGzWjxKR/Kf2DHRGgCY4
+��|*lPb�U�/�7��/�ct��4�qi�0_��W}��fx(	�E2�#�+
\ No newline at end of file

diff --git a/secrets/desastro/restic/syncthing-audiobooks.age b/secrets/desastro/restic/syncthing-audiobooks.age  Binary files differ.

diff --git a/secrets/desastro/restic/syncthing-bahn-richtlinien.age b/secrets/desastro/restic/syncthing-bahn-richtlinien.age  Binary files differ.

diff --git a/secrets/desastro/restic/syncthing-blechelse.age b/secrets/desastro/restic/syncthing-blechelse.age  Binary files differ.

diff --git a/secrets/desastro/restic/syncthing-cutieshare.age b/secrets/desastro/restic/syncthing-cutieshare.age
@@ -1,10 +1,11 @@
 age-encryption.org/v1
--> X25519 ldbXjtlzLORCTgg9F0NjSFk9EUOw/WAdYB3TTc1EvE0
-qZwtUJEUD45rsxvxagHqPZF+MmjxIP6ZGaBnZo8A+zI
--> ssh-ed25519 VgQ62A ZfjdQV0iwDW/k91tMkgLCmWe3qp2Ru3aZGj+ce7sJTY
-QiiqW0oSqXhrUE86iXyzxXJc/dq2sYAs4wLP4BIU9d4
--> -N-grease SR6[6\4L K5[/L`4; i_ bn+~j
-IO7EnpybAnQKBo7to+FuL5Xd9iRZSrQgwF7vzAIYQZ8rRLqPpf7QJZBi9B9+gAZL
-C9sftFz85PVVdrbZeFfSCsQINhc28Q
---- AFMdRXeS5fpuuT6hdYcRe1p23Sy8Af/6MMqs2tJoMbs
-�aC����h"��H��a�_�}ƴ� ��9�|ugK�7_XPw:8.-
\ No newline at end of file
+-> X25519 n6PvZsc1qBsbPCrqKVWBijTf1OZFxM6TGJCK16pHOns
+9V4PsvZGpyFGE5dIh0ErJtRTmOGZAr3rglq2MLOHYvo
+-> ssh-ed25519 VgQ62A vNketKYHwlbxrzJgWcytuiSNdnygKUdskrPYc/WfM0c
+3jdzfat/YrNfvRHb/zBRKSeaRhwDZKHm1U6BnmDLCOs
+-> )/yg!'zP-grease &2T
+cM0QOGDBly6MZsRLYueumXIK/znYVIbID4LD7FYA4nVOs1j+Y3LqJCTZ9zGokHK6
+rfRBEX8tj47DKemt2QZ+jBiY6XgsIQ/5eWDDGKq5qVew5lUQzLrI78946/37H0HR
+pmk
+--- mIf6y6I1LTyEQDhzliSECdwzE3Qntwy8XeAV991aJtE
+���=�m��<V���}��A|<
���?�.�k�3aG�9s#�h�N���כ:+
\ No newline at end of file

diff --git a/secrets/desastro/restic/syncthing-documents.age b/secrets/desastro/restic/syncthing-documents.age
@@ -1,9 +1,11 @@
 age-encryption.org/v1
--> X25519 hG7kgCue2kFeKnj/vR98PIFaGUWA0HCtREvCEfYrTgw
-SNRpcCDQILXS8YyXU/lD+lBWPLCbIQvB5ebkOi2oYBc
--> ssh-ed25519 VgQ62A yyK6I0PgZOvHnWIsmiFeB2YLCRn1sEXtOm/6xU0ZUyk
-PG26p1ggnNIHA4zktL4ijq3MUlsYEz0YvlZ97PWZ7wU
--> !>=y-grease AU O&^y
-btrO
---- R/I0Gs2x0kuv0v28j1TChKW1uwtoz7Vw+EXkpk1uWHs
-=���z�6u�r%�Ÿ�g�m:�W0��!!���qz�!�[T�f����7<��-
\ No newline at end of file
+-> X25519 CyPvm3RAeGNrNMQ2lO+ttqAXcS+N8unyyMlyyhjBp38
+ch9WKp1ZfraijJKZkv5EmQyiCqiN+Qh4s5CZ7pFEark
+-> ssh-ed25519 VgQ62A ci3P7xE7zmS/r+sJX43mmY1uua3OrFoc0IKoRnZlAH0
+UYwEjQaXGmvONw0RzH8Y97ebF05YAhCiAUGq0X7rjqk
+-> \Ac|W<>`-grease s:[L0I yPT v=E-pb {
+BXKppKbVLobWXZTYJ69FC58bHgM//48Vh9NRZ8TVLB0bVlQJRZPCk39/h1j4LE8r
+NoQdFqSnidcZLYsGA1c0dTJfT+TDW10zbeuXIdNSw5Bw9d0yk4QCnqgX8A
+--- 9cyAs8YxKVSqSL1JPbnIwnVtW6XlH2jkoqO/wvcTJLk
+ΈJ5:��n���.��o_s���j��Gl�`��>�)(�Զ��O
+4֏Wc�+
\ No newline at end of file

diff --git a/secrets/desastro/restic/syncthing-media.age b/secrets/desastro/restic/syncthing-media.age  Binary files differ.

diff --git a/secrets/desastro/restic/syncthing-music-orig.age b/secrets/desastro/restic/syncthing-music-orig.age
@@ -1,10 +1,10 @@
 age-encryption.org/v1
--> X25519 rcbFFgW023FekvN8eTGg+/jyYY6wSuOLgJR2TmTHyxQ
-4Ch3TJolQD1JzKX/E9LZDyHCpS7bi3rHv+MINls3iG0
--> ssh-ed25519 VgQ62A pnWQkBGUXQm76DhQhVVOuJA46ul8qzdgmGEBrJHfbyU
-CFHvIgwPlKj9MS1oGkjJqdM2GXaH0ZulM+mB/UugZy8
--> y`on-grease )D#d=Jr
-Bl3LCT+vhN0LraGS/tHhFXzqQ76sy3IGP5fYxBNz9RuE8h2Lw3mykrxEGT/oQfxm
-Tk3nXq/000pqjEk+X+cMn4i8xAK2TjYWB9haACpSmQwahk6uwEVSfMv8VRGeG2A
---- xuDAxOlQlsVJB2DKjd/NRY2Y6RqD99M7Z7a2VwVCcaw
-M I���r���=�%_���h������c;�.�����Z����|�;����-
\ No newline at end of file
+-> X25519 3nLLEzU6eyZnUl19C8vwdvXfFAWkA07g2w9ffkAlnyM
+0Htsj3qScuz+dEdA5+6GdpgUm/vezJJYwDSosu4FPac
+-> ssh-ed25519 VgQ62A zVVHY69A4qPbQ6Xj1ByIlVkwFJxJjf7jGx6U6n8lXDQ
+HDy/nCX67qBDIsY0NaPtmWmtyXZs12sjIDTUy/4xKPw
+-> *)!i-F-grease l= k#7Q#jy wW
+0uB/AeoZC7im8aelNHeG9IpeBZaXlnuhulxFnnWFP6R7e5AvfMG+T8eZoT/5WH7O
+hYD0rEMmsK+OhJKbcD/CLJ44ybxN4EwvpG09AQ
+--- 5FIZjgxaffVP9R6LGFoq1aEaHRTl4p5tH1Pbo9stB1k
+�A���2b�7S�w>K���#�\�RC�ߓ��|��!�YE՘JHK!"+
\ No newline at end of file

diff --git a/secrets/desastro/restic/syncthing-music.age b/secrets/desastro/restic/syncthing-music.age
@@ -1,9 +1,10 @@
 age-encryption.org/v1
--> X25519 9FBdIz6/YgJ9VsSb2MFrA/YIk/flAgBA+2w5IJmWgHI
-dusvywNU1q4+HKbZ69n4c2GKozSIb1HX2jpa9bzR2DE
--> ssh-ed25519 VgQ62A DPFm8a7tVIXgwfcaNuyh6tl+Y/f6XX2WNexOzWOFxgk
-yw19c4iJ7aHknzFerMwPP+oKEp9FWtQfxAgMA5SPuRY
--> -<-"`E-grease %\!% pfh{k ?#
-JQGXUGD22l7kbLZB
---- KZddlhOg2wSdRfYtF0vHAUfNqo+jD39KRZL/EvlXBVM
-�A�ivk���@_��9�R����υm@�}�㴬1T�M�$-
\ No newline at end of file
+-> X25519 K3ms9DAkbMFn34VybdnZF/Op1SHbJM/vkbMNMUszXVQ
+cfY0eDc/Ex0QcQiAce8hgzeVWdg6V1JwuhE4f+NdAoo
+-> ssh-ed25519 VgQ62A Du1Mbs+m1bV6+n21XOMjrshAKj3vgFJYH22ygnMkdxo
+X4vTG2wfM9Xy17DIoxv+DELWkZ37s1egPLbSbcCbaj0
+-> u|-grease
+L6g+wW9tG4xCi8u5xRP/7C2Wok27CxE3keYgyEw326vjji8kxert22STXfsxXkrH
+4puLuG/u8D8DH+BcKLcnhwmw6mmWzdXT4NuM1o1UB/SNikA
+--- eAcTfu/sYlG2Sg/y04e0yPZpSgYGcEAUBt58RFCsGHU
+3�AK-�<a��o'��C?���=C�'�382�[Ӓ���	%��ɖp�kx+
\ No newline at end of file

diff --git a/secrets/desastro/restic/syncthing-pictures.age b/secrets/desastro/restic/syncthing-pictures.age  Binary files differ.

diff --git a/secrets/desastro/restic/syncthing-wiki.age b/secrets/desastro/restic/syncthing-wiki.age
@@ -1,10 +1,10 @@
 age-encryption.org/v1
--> X25519 Wwg1UBX8qi8YO56lOvHxMmNnTE8QPP037v4Z8gNqhRM
-nWqr7EgMt/LW3olzJ1keiZwlktqAB09gyGQ8EuPh6XA
--> ssh-ed25519 VgQ62A Co0YVVpNsxLthXAdw6yBFaeGRzatFAhTZDPvTWwzYkU
-fKYPszYkmM2Ugntml8jEsGTOY5JRkUizcnsksvXStAk
--> b!`t-grease ~<Sv[&Ny Dj)}_a
-9RmpJSW9AZ0dretZydRrmA2K+jQUH/wvIJnefeN5QD1tD2asmhpv6vUY8X4R7kNn
-6mWDcuwKN98Runf/f828
---- MjL+yBst2mluiu4tp0Qv7Zw6HaTbsmDEzrLqcc6uJS0
-���k��K��v��.	>���D	�g�6�=�ܛ��&e�Dr�3-
\ No newline at end of file
+-> X25519 QRoTNFEc36YL124GXgoRTcgwxY9m3cw86nUJQg8A7SQ
+6IXCjZOU71LPbE28bxk4/MV8b3CNZlBcn9ZK9wA/K8U
+-> ssh-ed25519 VgQ62A MTJ8lL3PSrLJPTo/LX9KHwUaC0RJm2EyiN7d4BvgpC8
+nxxh0emb+XPcNdCcnF+nGBHhBC0xf1q3ZXS8M+XXQGw
+-> 0;-grease nB|eej& P~ ~~tui<_% T
+3Knul9bW2pi3si0b0nQm+LJsh/Xj/LetnlXfdn1jQlwV44m2CNBnK0E+AQNboVXx
+0hRRE4j2Q8LZF3U
+--- l7odf51953mMlTCR3cmZTQkrKxW/SPEL9xm4I37TWmA
+��� ���9�{D����N��
x,���X�u�f1��q��j���N�i%+
\ No newline at end of file

diff --git a/secrets/desastro/restic/syncthing-windoofs.age b/secrets/desastro/restic/syncthing-windoofs.age
@@ -1,10 +1,9 @@
 age-encryption.org/v1
--> X25519 zumkMyJPLBibHrHHZix83HyIvmrHo8LETsw7hT94/CM
-fS+W4YQcWMbMDGd3uB1YEVDs7nenpHwuoziVizzQiEI
--> ssh-ed25519 VgQ62A ZWjD1PGJtoBMRn/hBmflrHn8VXPmGK8IHY2+wHQJmSY
-CVRZPIGKY53QvXgExP+Lm2ssc+1wV5gSFa6koUY4ngA
--> ?6Q#"z-grease .L$ H#64aD #
-tyrg+T6aTuPFaxidj226PAE0urfz3djPXsJQFrw6ySqezT9vBsi/mCLG5OKd11lk
-n1zVneOBpETwLa2W9HwgRG+bvme5ILNrJzYHFSpKVSpw7CavTfOhlb0HtA
---- k+gIw9l6cC1Wloloy6s0i3yRmgd4wGKtfgkZ/lT21vo
-������1��	�T�J9�/�;!�5�&=�:��4Q�Պ���m\���-
\ No newline at end of file
+-> X25519 VTUdSYZ3d4520/drtYZlHQ0amOmZAT/ltml7AF4JJRo
+9vdcVovaDqLCKh/v4E9x4ny96BRBg+oW6ZI4voNgu1E
+-> ssh-ed25519 VgQ62A Gh40i2sVBaPs4qisvjQEbJbVWNEIJQKQYk6R541Ak3Y
+TFBfXhxCh0rqspU8Dki6jUP3OsKnQ+p+PJHHVAoiOd8
+-> OoYu}ZI-grease hej+
+ZbNa8+L2CKQXwyknHuOuMx57AXhhyaH79f3+d5QTokSAmkt4Wrgm8mY
+--- UzB/ozkd1+tJeCYmNtuYvd8SXqfPVK+3+Veh+m9JR5E
+}=jM�����E�N�����|�XG"i��7����ە�M�t�����Lwe+
\ No newline at end of file

diff --git a/secrets/desastro/syncthing/cert.age b/secrets/desastro/syncthing/cert.age  Binary files differ.

diff --git a/secrets/desastro/syncthing/key.age b/secrets/desastro/syncthing/key.age  Binary files differ.

diff --git a/secrets/desastro/wireguard-privkey.age b/secrets/desastro/wireguard-privkey.age
@@ -1,10 +1,9 @@
 age-encryption.org/v1
--> X25519 AoROvKdQqGtEqhpErPFZwsJ2qUGqAMwSVmEWHttVeGU
-9YsbQJV5aoSr8hlvS+GaoMMBgfMj9aBmalcyMHLnve0
--> ssh-ed25519 VgQ62A TU8yzYuR9nYDy9uJ1/4uKbvD7hT53w/B8E62fEHhE2Y
-WCauKuDyDdsjJbT6Iw0JPSk3/Rw7mvMUSpirkcrLWbI
--> 0o-grease <{r%4 B7&`4[S3 *EK[Hdu'
-oqI50a0MANQlMAmtJ4cgi/uwYNbmhkOjiD/TZAyctHnIFH762Bkj9C6exhwoVXQV
-7w
---- HJl/JKbtk5Fq2gH2oBIS5D/8wU0y3asnKKktfrzMOM0
-.e^΂�A���B���Ut�	����:�H�Z�n�C�r����5NUY>a�Њ�&4�k�Ѣӥc���.\.>�}-
\ No newline at end of file
+-> X25519 hCb6Dtky/V+UrRAb0NMPUyognHdNUSgUIVmtsQ96Oig
+LlGTo+nCDBCahOYwE6ASdgda35mKkSa+uRsyCn2x/kE
+-> ssh-ed25519 VgQ62A gVSKVDAS7lP4SNvjLPlEN1SSG1hRutxY0XkKK05mEE0
+TGKEADvBxhlf5FpyUm2eA+qOpHUVezCCVjLFgND6Ctw
+-> *mT-grease RqJ~R1 +Lz K;hO1c DM
+bXEddX73/x5ihNAzX8TE5hyMPkFBMzoTtDFBi2hH1owuaMqmhbAIqlI
+--- VsGxyfgoyBPeKcBru8WLIG3aXt6OzngIDI4p7saeYNE
+�\����b?;��%��WNI;�k���{�,�N	�:e�~����P1c9�*,�ȉT�c�����P�:e������L�+
\ No newline at end of file

diff --git a/secrets/hector/restic-server-htpasswd.age b/secrets/hector/restic-server-htpasswd.age
@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> X25519 XS1Nq4A4KCPdopvYn67G1CUNxI0zJWqfwM4X5BBoCQo
-95ztvUAvERIHaa9yeR3fqvL54b++Rk19ktNeE6w2l2Y
--> ssh-ed25519 NrwbpQ 7M6C9PPXTS4mLOZWrsTh49gHTozYK2Ur7OU7xR/M0FA
-pnUtHotEeqT7u5446RhVsnnlLHU9S8vPgO1q3ZnBuKo
--> yA7S`s}M-grease *RqJ ?{ ">;~=gL{ jzFZO[
-p5eMX9lS6HrkxRFVYIINcybbroIWf2g3FKpNUjjUWnhHCio
---- xhCHRBQYxhExKx/WC1zG4fNLGpMIYD1aNI+Ql6+mvLA
-;5[�j5X43[a�xG�t��	�,	��6�F�k�_Q3��(Ӄq�$��.4�d�������ڃ����͕K���-
\ No newline at end of file
+-> X25519 xGKK6ieukEOXFevsNVmUyGipqUEPufHi6sQxf9QK8l4
+M89MS19Ifijk+mWVyepTwoGz5i8G9e9imnIgcK3Cxuo
+-> ssh-ed25519 NrwbpQ nJXhiwCY7sDNilRsrAs3C6iWyfLHicoQhI1HKDHiWQw
+iJy7orayoMyKEcoXL/xXapZLD/dth3Co2SniD0pDrpk
+-> QN#z-grease $XBa q35a+e=? {F O(5\)$*
+rWiRB4/YCwGWiaLkkxMuxl26HW8UH3TBOAR5ISn0xrVGa80s+FEt
+--- h/4L8wT5wK2Pgk25SUQOhcrXF/HVCjAe4EjLGKzG+1s
+��&a��2�B�?K��U�TI)�������e�\��a;$�^�L>��Up����)�G�|��nJJ���
wX��+
\ No newline at end of file

diff --git a/secrets/lollo/restic-server-htpasswd.age b/secrets/lollo/restic-server-htpasswd.age
@@ -1,9 +1,10 @@
 age-encryption.org/v1
--> X25519 QaOUBIqLesY5UjB1KyE5oYYhVwijMweCNW+ZWDKEe38
-WfVqnkEOtK9PA2BFMRy7TKNZOfUJ8SMVxWpLrfCKo50
--> ssh-ed25519 2LuoZg j/bpnR1+tmfEzk6LsUjzKrdeabRIbtQDGzdtEr1vZmo
-M5vbFp8oJRLeaQEQO+6E3LCL0H1/jY39p27el1YP/8M
--> Z-R5.-grease Mg)
-lSZdO3nXujC3R2rkKHbN2DUUsnEUTqexRUkylfo
---- 6vO+lMv4dYKOzEYBo95ay5XwYJzavGsRKfTMphZmPu4
-�`��q��L%|({�ղC(0�����.�b
N5�A�	���*�X�a̗#��-���B�gK��cW��@-
\ No newline at end of file
+-> X25519 uF6+SNBwSsIjOv76vG3H7IxeGSvqAw84F25wwZBZpyY
+Y77ObCVe9chhbWynuJPSorCtrsHEYbuen96c1LaiGkA
+-> ssh-ed25519 2LuoZg HueTEZaPXcJ2AQi6VVkuzg1DerN+qvYanyZNQGGF4kg
+xkN/VCSphMAUPf5d1URXU8at+OGRx0T7Vs5y5Gz7E0c
+-> FSKK9-grease
+nP4APuXeHjEc4opEOwya+7he4GEkeP29RMvNM/7rlHAYXnF4rgj/ogAHFqA+e9ic
+eRYDzWJQsPTpfvquw/oimZhaAwUCY9uzV6oFOAx7g65UePWUzS+SX6u44FRAR8s
+--- A4YKSnbZqi3bv12gFMDcCjXZ7golzPfBfSWEDFDChcI
+���m|����"T�[�‹��S�����i�b�e!f�Ql�HA+P�!���U��xW�ܷ� ���u���q+
\ No newline at end of file

diff --git a/secrets/lollo/restic/gotosocial.age b/secrets/lollo/restic/gotosocial.age
@@ -1,10 +1,9 @@
 age-encryption.org/v1
--> X25519 KD/CpqEGeoGnBAxTUZ34yYCgOxVs5EDCf+CfJca+RQ8
-40HI4JDu+xcJErNhVC7AkGmZ6vANhZrD1CEZCaDyfT4
--> ssh-ed25519 2LuoZg U49GckR4L5TjDeZZOUrWh1XwcJTgnMxEPIj6io4fNyA
-2lW77/YbvnngHmToGio061YiqvcGEm/Rc1sflpdOqlo
--> NI+"-grease
-VGQY/Zjgdytp2Y82UIyCEquBH9TqaIrT8ozHHTWBhw
---- rrdciEj2OXAjKZaUjeWgCLX0145aaxlH1+EaVZmM55A
-�l��x|G�����K�]qY�)jH�s��`��m�8o=a�0
-��
��K�R&;�9Ւ���}׺Im-
\ No newline at end of file
+-> X25519 aWGlm4xFWKq/79swCAwZSR3qrJeuIHll0Es0u9F3+3s
+8BrckcrVghxXy5yK6Yout/bXsTaXpOAWWFcneeiBbII
+-> ssh-ed25519 2LuoZg aEmCyix8wktWsZVP7wQPW+nRYdNh93IfZHYJwPfz1Ao
+P/eVk8nRtE73jN+lNQ2hjGuxo4AQhQATNEJuCMm2v1w
+-> wj.2P-grease
+13lJwg7qGfSYI43wglVG9TpX1Us7JXfREO4xe7D7gSsd8UhJqyA
+--- PH9kvs3YiWwmtnFtw4o6IQmTn32GNifhjZ92W9JHPeE
+�?v�#�0W#�4�&�V\�,�f3�;�-�X���|�>ˇ7T���\��&�3t��+��'C��/+
\ No newline at end of file

diff --git a/secrets/lollo/restic/oeffisearch.age b/secrets/lollo/restic/oeffisearch.age
@@ -0,0 +1,9 @@
+age-encryption.org/v1
+-> X25519 AcVaByDpLMkv/8D2Uu77LxlSkpbeRNZ8SYcJtSKVS1A
++DRBAGYECJ4i7f2oO33tjvffvyRHC6thq8ygcD4ZS38
+-> ssh-ed25519 2LuoZg 9/KrZcs6+d9pp6dW+YrAebMOrSHqUx43hVQokG9L0Ck
+6iGHu1p17cl9ivbS3wGMI0E0v1UvliH+KRulSK7rnmU
+-> :crc-grease $
+ODTZp1+V4DpeCglNy9RWQ+esG6wMJVqt17nMF3nRcbgyMIg17rCcp+mLyRZu
+--- 3DWaAdTvlFnPa21kSs4RiyEJM1y0CRjM0sMCG5GUFmg
+�%��#*fI	=�)3�Jg<�yhS֧��=��"-�E8uW�eeä�]��"W���<+
\ No newline at end of file

diff --git a/secrets/lollo/restic/vnstat.age b/secrets/lollo/restic/vnstat.age
@@ -1,10 +1,9 @@
 age-encryption.org/v1
--> X25519 WRQ1tvVO3IHjHybZjDtDqXSfUclQHTxZ/mC1ajVEISo
-RU2xYU/wo42nPRvqBMMMWkebuV4KnEtbs/5tDztHpbo
--> ssh-ed25519 2LuoZg UC8pbhTRF5SHQuAgWk67ZJFq+GtyvAvrg7MGMg+BRFc
-d4hythB8MvkSvYHCZvzXLGTrXO4szznF2xcaUKIVOqw
--> o!*-grease 3-)-HQ"
-LA0TU7VzVfGCUEpXQmgTqjdZ/bdVhFh0JS2DQT0dfgPpKRVXRjoDDOuOPx/EYdZf
-
---- xVhhnvmMAkKNleIr9C9oU7qE/JkQnAhXmN14kT7uN/I
-��z:�b�#�̓�<o�of��<B	�x�	IY;�8��#Nܚ���@�^,-
\ No newline at end of file
+-> X25519 3Ck/4goZVnLd0ywFnEx8TppuR2H+R/J6e87G6U5+zUU
+E+FsOr+sF2eR/c2gW51Ahmc9/PrbAxn6t5RuCx+cclQ
+-> ssh-ed25519 2LuoZg kArlq6Vj3ZoY6HCvtQINVdn5QyyLP0wecS+wPR8ujVU
+a030XPgkvpQcTwyGb+vpGkfZRJcf0Oj5TMu6TzGEB3U
+-> v-grease NAK;) 2x/
+ISYhCTCWng/lOse+tQ
+--- 39UaSA+EGgnfBK06SJyQh+/pULnQivaDoOWgPgPQo10
+����_�6?`���k��P��2k.��-}����V9J�i	��|��%AvF]U3+
\ No newline at end of file

diff --git a/secrets/lollo/syncthing/cert.age b/secrets/lollo/syncthing/cert.age  Binary files differ.

diff --git a/secrets/lollo/syncthing/key.age b/secrets/lollo/syncthing/key.age  Binary files differ.

diff --git a/secrets/lollo/wireguard-privkey.age b/secrets/lollo/wireguard-privkey.age
@@ -1,9 +1,10 @@
 age-encryption.org/v1
--> X25519 Wr8bZw44xo8PeGRZ1x14jsN0LSJedpZL1v/McZrSEjQ
-VoRjvoaxpXAgUUDmJNn35tiDuiR7Bub7d0bzEL5VsoA
--> ssh-ed25519 2LuoZg QHNgw/IdTd9T6UR6oQrRN9muzp9dKXEgBoo8iEoM1nQ
-vZ0wfqUmsAbjA8CvuOURflFOnEUIKICJi7a2dpEtzRI
--> 2Tb[iu=F-grease #%dgt8G _xu!eu*Z
-TUAidC8ITbx24vjJaZaB6aOotJr7tEidD6PBOLQDR24XbJ6od8HcGO5g
---- /dK1JNPaD2zw8hzzvxSE1dKcZGxUh9YKWdngXNS7HIM
-�M���#ّ�/}�mܜb+(���D��(�JE�����`)Y5P�3�F|�~?m�p�gpղd|n�W��7�mɺg��-
\ No newline at end of file
+-> X25519 E/+CznsylhT9SjwtU5MEn2oGu9NbdWJrSupoWPZVA20
+XNA1+Ke6Z1pCVWVZQl1oGhQnvnPcx8ReEeDrBLhikg0
+-> ssh-ed25519 2LuoZg ici760b6qQOoVuA0YY1ESDUeGGWhrG4h4Md+vwwFyS8
+OGvSvvPRxAI5jZ2p3wWW57sQSAHRmRl1xmQO5V7hP8w
+-> _wO}bG-grease hm%@Nva
+b+FMNdh4ZGrfTMrEEyypxI4KyEWNH0XGmafUGVJgIn3va8N5N0HUt91aeBua+EyS
+m50Xr0S7ZfE1+/xX
+--- zTlo4DoSETE6p62UU8TU2iUjwteblxRiZxq+GsxRixU
+~�U��44;��vC�Tnҏ�!����� u�!�5.�dǴ�Z]�x�	��ߢL��z�@�h��(�
����+
\ No newline at end of file

diff --git a/secrets/osterei/radicale-users.age b/secrets/osterei/radicale-users.age  Binary files differ.

diff --git a/secrets/osterei/restic/gitolite.age b/secrets/osterei/restic/gitolite.age
@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> X25519 5cdHFb+g06UCn9Oilb2WtF6DaV4+Owhn3OZk+ndlSm4
-cZoyrEBPwZJ2O/qw4f7OEwTWaTVrd9PqTpgFjTUx7vU
--> ssh-ed25519 YtLkIw GJTQuZiESDiqiKRTjVrCeYFvKytEUeeTnKJTDKafD3s
-YTTGjCcB0rNN5v0kHApY2t0UqsM3n39b5BWudEsB6eQ
--> e;GAR:;-grease
-Jad2CAmD65FfsT9dLioHy89cG8i1rkgDb4GaCimJeR8
---- 5HKTo7OKQedELTmOoiZU2/1kDZDaLsEDU+uk5Ts6f5k
-i��P���pc� ;��N��b����I�i�V�[&���0�F�)��it�[�-
\ No newline at end of file
+-> X25519 DqaE4LBwHQtzpWGrLAmjqxvp+ve2HPX4nEDOBTfOJmA
+WJnzalkQq8h82aljRFxerfiwA7jCxGCu93QW3PMMOvo
+-> ssh-ed25519 YtLkIw bLKtQUbrN7Z4neqRWy+K4KKjys2XjV/tfPzEoy5zqDk
+SN4t2Zq266o7cNZ9O6bSUY9wGsqf8d5Ywmo1H/9r2zo
+-> CI-grease w>) Tn(c
+ImOFz3/izxiK+u33z0YzaAiqsHct/L8nnTM5
+--- aAGQpq66iqCZwrOVPO4E9omL4XhLmqPcrojKhFAze6I
+Ӣ�II7&��\���!ǼP���a���^��õH���
8��+��F�8�:g���(+
\ No newline at end of file

diff --git a/secrets/osterei/restic/maddy.age b/secrets/osterei/restic/maddy.age
@@ -1,11 +1,10 @@
 age-encryption.org/v1
--> X25519 +ojEUmzqB1oX9a3O56gJ6VObIRqGeL33rbR/FBbxC0M
-WfLwsyh61Qt97RQae/RRZk1LZ0OW8luezEIH80Un8dQ
--> ssh-ed25519 YtLkIw 6pleyt3xudk9LIRP9gxTRRWqow5rYvqfRJBfnGM+nj4
-1z9AnpXt/rhV1Skf075bayufPTwROmDSQhoRX89VvKY
--> 7e\&;;-grease
-lBSXJM86HYcn9jHJuerN4f3uUqN+4lS2tfwyeKOaH7CkVjYblQBszPgq6FPAaIJT
-0LGOSmb+Z5+Imw7RaqRUhvNTeMz5Nbu6u7CyAksSsPyGlvIDUHtg
---- 1GhPxCR5dikw0pu2ZVS4sSAgA2IC5TMXuC+8ttx9UqI
-�x
��0
-P�H~G�ka5�K�����(5����XQsBp���H"kA--
\ No newline at end of file
+-> X25519 Hmuf/VosCL9iCdkUfaTDriF1My6rWhgZo8PKiiGxMWk
+tOExzyj/J6su3GUnIgm7ogQNjtzLkuYA7boLwaAnpuo
+-> ssh-ed25519 YtLkIw K/4+xLJxVK5u5+uNK6/WeCPKqh0N4Fpxz6dvs1j043s
+5aB76ul0j/yxHntRY7bMoL5yRMbMab7FggKs/GuT8Kk
+-> h-grease `U|{uKHB a]Lft, %]ZR4
+Mn5F4gEg5wSPlqTtFrBn5LM0BlkVBtor0XIwTY0qajGJzUd5Ya2kR+p9QRQPekAr
+DAXdhC/U4R1w/XySsd9ajVK6jzIoGmfJlcuUg2yAD1oy1I5X0f3n1w
+--- uPlKpoBcMu34fnnWnCOQBB8W8ZpVN0okfRDB3uji6FI
+e���"H��ǁ��H�U�����<(��Ъv90.�`y�X�����>�Ԩ��J���+
\ No newline at end of file

diff --git a/secrets/osterei/restic/matrix-synapse.age b/secrets/osterei/restic/matrix-synapse.age
@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> X25519 7UbevaHU09mH5b+bBGszRaSRKt7FB8Bm2Gz5YhiJVHg
-vBKAkoAZCzZ8qCMsvcy42DrnRrUEq4yUNPHBtH6kNpU
--> ssh-ed25519 YtLkIw lZNTC4GbkCFcwVGmUtW5GgEpa5SYuRYUI+77/aRiLEg
-o0sxwxChjcMM2DqxQ4yaPPiUThiKAjBAyVZb+ppibqQ
--> 63_wbJ-grease LI`7Lv-I .l;Bop@
-
---- dzpSIcZlp3E0yc+3w7yIzvC0OlK3uK6dDxcF0VjWoak
-��
��*{ש:mK{mťq�Eغ�j��?�
���p��-;�<�e�����9����-
\ No newline at end of file
+-> X25519 bGiXSSpcljFWgdaZLVSUCoYqhWp/Ve/aPu7+mrmUUj8
+KMlcAIroLMPwkO8dxe6HfqKwiswwESr+gzV9kshIswE
+-> ssh-ed25519 YtLkIw cy3kY9R1Au2Se+QT/9+7vhDAZIUkaF8FcKOqdL3Nykk
+76wT1g2x1pmW/jWX+oHDjv0VC5shBSm9rH0rvCmfh9k
+-> J_I4q&-grease <[{lA{Q~
+xTX77WsOuw
+--- tio2KLSvQZPOFv3y1pYuTJOfGGhPkDSIbqvFiuZPZfg
+D�GQ�/;��ϯL#�`�~��Us��E�!+ݐ��$�ߏaz�_�ȼO�N51EE�;�ei+
\ No newline at end of file

diff --git a/secrets/osterei/restic/oeffisearch.age b/secrets/osterei/restic/oeffisearch.age
@@ -1,10 +0,0 @@
-age-encryption.org/v1
--> X25519 9jJs1aE9oqqkSiCcpf4HSCTQYKoBkyRCCYED7ig6RHY
-Qy9A5LxOq3WgKtunBQ6V5JKkX0XzywP63RnrQcicP4g
--> ssh-ed25519 YtLkIw hXSHj8x4IV3MSTs3QxfhEfsXjBNBPd/sQ+ug9le4BBE
-TX1lckfXX1W+A8VtVXkQ1rzEEBK3PbqdTOXzUKr5qUA
--> /OUX-grease -K:EM1[v g
-4U1vGNgWjTOZdcl/gvlrnWfMFrWtZQDvzKMTLz4Ws0IbdLudqQOCVlRIIeuHqxTe
-TiAsPzIPMVeKR2BzTbSa
---- EMioO0XSNG/t0I+enItsbkx+UGiuJAUmRBgrBD/2nYU
-����S_�
&[s�J��*�h��需�0��:��o��N�)��һߕm4���o-
\ No newline at end of file

diff --git a/secrets/osterei/restic/pleroma.age b/secrets/osterei/restic/pleroma.age
@@ -1,10 +1,10 @@
 age-encryption.org/v1
--> X25519 1d3q95MUu2V7GJH7+pwU/kQRXZkdcet4OV4nULamdUs
-8AFVzluWpVvpSrdLJkthpujykh8lDovXszPGGAif9Vg
--> ssh-ed25519 YtLkIw IQ4TelMWpJzODNBSioI0NEYn5VZ7yjvieCIE9wjDfm0
-4BsblC2TDFZa4AAcCR1JbAyan/oeBQcYPOHLWrJbTEk
--> >F$`F!-grease
-H/Bdbzh3FdL+BUd4X4HMcCOFGw
---- GwJoh9JoZEYZvXw+dknlpUF7AB4fMbl+om8lvR8n+eE
-	��\��A)����eK�=S�
-(�v^�L�>�F��:��l�-��#�*��@}f�kVN-
\ No newline at end of file
+-> X25519 p8FcD2v8Jak2lkKyzbzDA5tkrjOXwDIVyCe+AhRcagY
+2Qe9lLO7jiHk5uNblkVunYu05reeaaDUY64m2kJ5I84
+-> ssh-ed25519 YtLkIw XeofKIyZBB6GV0H4mdCIxHCv/v5jLAy7rd5Vcw0qkUU
+QejwXBw/Th72VtloDV0oSA/Q/QnigbYjNUiMqbC4C9U
+-> 9-grease HG8>X=;4 di ))cC&J;K
+FHYYfpk/h0QSTfp1rMnUkicEbs6aTZBMHDhk5p3WoOVqFVqXOWSPthmp98L/3uXk
+5kw
+--- S8ZUhRPA/8FCTI9LW2/bgpRdLur4m/zzZXdq6e60S9E
+���Ag,c��W9�����!��j.�@��v�򉝕�P�8O��w��A�L����.�+
\ No newline at end of file

diff --git a/secrets/osterei/restic/radicale.age b/secrets/osterei/restic/radicale.age
@@ -1,10 +1,9 @@
 age-encryption.org/v1
--> X25519 jc52aT98eVxocYQXHXbJR5l0giYqOozCxM+awPr/hSg
-9752defxPNHUwENCHIY+ianP1MGKf97C6uwn51dTT0M
--> ssh-ed25519 YtLkIw PlRMAmXL00YB1t5ceLGHXFIAcPCJcZTxafM7/R8/cF0
-fU84ir+7mSR48XV8OL1dQqBMXZgCr1xDhokDiLq9PRI
--> $|`{L-grease
-+OyddPDY0yFLWoccRVaM2mhA7p08Rga+lw8oh/KetkX9d+Sh
---- /qdghyesr60Hysn9+2fXRDj62H1fJRZq0PRD+Vzzwfs
-M�z��	�^�ۭ±Z��n{;�Qºʻo�
-������=Xj��7�\U�����a9�@�-
\ No newline at end of file
+-> X25519 YNwXbJWYRyIl176nAvaBS37G+o2Ma6QcuLji9cNzB1I
+ho3usMUu69DQUIunCRJuZyiEQH7/cKLjlXrcMbwUxD4
+-> ssh-ed25519 YtLkIw mjVKIZaaDCOTXSPxnw/4mdwYhcjqAD/pEqnrlZkgs1w
+znoT9B77mXiL7swDEA95qhZbU0ZcqZORerkf4MA8Q4I
+-> 2l;!0$L_-grease RP} nV ~bp^ >ro}5q6
+Y6pJfjdqAtR/y4IXTB3D6KHM3+dAAA
+--- GBDwNvtE0GXMsNVXV3hwBJYjvauJ0oDXRhe8DXbwnds
+��=E�#�bE���e�	��Dj�gC�#��[��v�R~"���1;�o�.h4}�up3��+
\ No newline at end of file

diff --git a/secrets/osterei/syncthing/cert.age b/secrets/osterei/syncthing/cert.age  Binary files differ.

diff --git a/secrets/osterei/syncthing/key.age b/secrets/osterei/syncthing/key.age  Binary files differ.

diff --git a/secrets/passwords/leah-at-f2k1-de.age b/secrets/passwords/leah-at-f2k1-de.age  Binary files differ.

diff --git a/secrets/restic-server/desastro.age b/secrets/restic-server/desastro.age
@@ -1,16 +1,15 @@
 age-encryption.org/v1
--> X25519 a0jMTAEUwK5d6/+KDtTJ5/yBwu+0szUwRgPNhC/qjlA
-VQ07B9CNfvOn9jvdayPZFK2tAy3S/3JR8xpPl75tk+8
--> ssh-ed25519 YtLkIw EEHuPiSuD2xMV1q0FrOWVdK62zK33zmeQm+BvYIGOyE
-5oT6M6r5MP1M2naQpekAFExnxOtqoQbEMgf4jEKGNgA
--> ssh-ed25519 qAHlAg tu8Hs9fe4MD91qUCzSoA5JH2GGQdhTH+4Tde9ZVx6lI
-hfg+WKxZaae89Q2pom8vv8/131dkJkFuD1KNN/4SOzE
--> ssh-ed25519 NrwbpQ 5XmPYoH9cdV+aZTCq5duFdCxgUFnGZvhwo1tQwrRpzc
-DMRmJd6jRw4pJiAHM/j6O425lAKxn6066v3ftL/RWlc
--> ssh-ed25519 2LuoZg Tl9objRS/t36V9jHlLcEJ4DHCHHOjpSbadvxuo7ixHE
-a0Eas7twwFmEejLn66ZCU+rx/M7TLwLRjzAev66+/oU
--> )B*<w<-grease .5>@ #?\TTv
-6PfGcYybe4P0KOMvTayFNYJiCAi1eVlDTO7aKS4BMUeDgttTS7UL+tznKM1lA+ZH
-BNbmKIoreBpCZw
---- X9nvkaWqk8nYfCNXW6Cq6BDhaWq9u04pRkVqN243hV0
-�2�&ይJ��u	�N�7����O���2F-��;RZL�cE��<-�4o�߸�D\C>1IT�X��2���+i~K�P��:-<
�^-
\ No newline at end of file
+-> X25519 YgxcYAxDCoinouuJu/KAzZmhbJBhn87lVAYo1P+Rqzk
+dil6d9wR8n7uEp+H/ScaWdXOE3B9Wgalrl8BzhQMqII
+-> ssh-ed25519 YtLkIw P4uygPWxMUODSRX6Q8thv67be4ckkZwkib4QZvfTskA
+T/TOGhcAA2hPEqYMYcfXU57KH+HAAdZz+Kz9EUSEUc4
+-> ssh-ed25519 qAHlAg UOVmiU1QhTNBUz/OkFyzRz2q1HRR70M4Vsz+S+R8cAM
+WsymeqZlrvO8nN0uk9Y4/vy/5jKHyoX5Hks/Illdg7w
+-> ssh-ed25519 NrwbpQ r3UrEcZJsAcI7a4+AqVwYrKLT3IuGxCY59wci3f3AjE
+UIjwYKbAD1tNNWMit2uliR9NnmwIMpy/ylJ55vVJT3k
+-> ssh-ed25519 2LuoZg r6HB8V2Gwipv2o4sOy1Pfdw+06pPY6u+e1VIEbRwW1E
+PldREAyJIc40YIP5k/Q65DTRDN4DkBCEfMb1uvdAmIU
+-> F{-grease % FdQ ~H@z f'Cp8M
+ftFkVvxmh3yl1rbZWllD
+--- Lr1dxRHdNsVmbDSJTo7zDqwZYHnAc5FRbOlC/WHu+Xw
+xQ�OT�ⓧ3�9�"�s�G��]^V��j��GN��8��?.�D�&.�nN����5bT�"0�6���ի!
g��f�Ej�F��+
\ No newline at end of file

diff --git a/secrets/restic-server/hector.age b/secrets/restic-server/hector.age  Binary files differ.

diff --git a/secrets/restic-server/lollo.age b/secrets/restic-server/lollo.age
@@ -1,16 +1,16 @@
 age-encryption.org/v1
--> X25519 s0vZGA1lzEiSoY7a9emyn86OBn1u+Q1dNIA7MfhV5Fc
-PM0M+0pFBp9pY8oxieIcWGJeyjCSYqcSu9WAE7EFOA0
--> ssh-ed25519 YtLkIw eiF5YZH1bRg40hoEpN35DmGdYuCWNarGDl23MVIprU0
-Bq/KzTi3oxTDsriVrGuXL/z2uYc5xiOP4oCckpzgwcI
--> ssh-ed25519 qAHlAg 9Hy+J2Jv1Jv2CYNeO4m/O3tvY6UwXHa4h3ACYQ8uPU8
-oldOlSENHvLlLMpaGxaP1Cww3ZgM3Q8Wp1HR8mMq3o4
--> ssh-ed25519 NrwbpQ nctdZ8TjBUvqboWurfVV3bF+y783fer8hP5CtpyFKSQ
-U7dVwhwKSKIWflCLVzDTzj+DPJL9D3VqOGTArohRMZA
--> ssh-ed25519 2LuoZg JOdrRjSOUB1i780Lsk0VkvaaxqIV8i0EYxwR2R817U4
-uvsmFCnh5p8z7hAyFeO9Zzpu3TShKoB6Zd8gnPeDa8E
--> @7g7z-grease %0X wm
-2CbIQwjuUST8iyxOoxQz2Q4UwGmKkgZzRfquagqA1kU
---- KH9/1mNhby3WQHctc5yePSoqllsSjVrRETeCylgJ7zM
-���'�fI����LB�!�O����x�@�e\]�u�
-i.cӾOT��ԼH%-
\ No newline at end of file
+-> X25519 K8wn5t1/gJTx8RLQ6/SkxIgV4fhPeZwHrbShnKrVygE
+BbsvANH9KhBGTppDmjhDkcjIin0drJVZgiL21Uabd60
+-> ssh-ed25519 YtLkIw iVCMQBtDjHzCJLENOGkGN7cbrrewC0CNqL2BFfTOWSk
+NU2hsgl78QCpFeOGGjZ6sGRQOo8a8FbRZnkKw+NNirs
+-> ssh-ed25519 qAHlAg 8X1rsQiMO387tVcd8hYTu9okemPx0YI4PmFTvzMWkDs
+lrVBfawyp+RWpAoTq39ELTVIjLGi20lStxlw+J5PjEw
+-> ssh-ed25519 NrwbpQ Any0rqVaTxBX9c5M53tmR1/oBKbPMD6EEBa9gdIK5BI
+wcJXCZyCVUzQXPcL6F4FALq9W7xj5vUAsshHs3sAh/A
+-> ssh-ed25519 2LuoZg xOgq3u1SlzFGvyKjn/Si1GQQi2J27g/PTfQOs+m38EU
+WkUIdHX6Y+dK6TQDTEy2NEO38ZRsq4ngrEympFUDYrM
+-> F\e~soeR-grease @z2EQ!
+jafPlZJ2uWZhmWORCagMr7FrnU8HUMPoVayh+fZP64sT7RHakbIel8rNxfKEYkCB
+TvIRZLcJ
+--- FjlmBjC82SbqM6pSCMP4l6f8/bsNxjhvhNkxaxC6mNk
++�
y(��x�sޱk���Mr���\z{�Y
�T�~{��|
�3/��;��8+
\ No newline at end of file

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
@@ -44,6 +44,7 @@ in {
 
   "lollo/restic/vnstat.age".publicKeys                        = [ leah lollo ];
   "lollo/restic/gotosocial.age".publicKeys                    = [ leah lollo ];
+  "lollo/restic/oeffisearch.age".publicKeys                 = [ leah lollo ];
 
 
   "desastro/syncthing/key.age".publicKeys                     = [ leah desastro ];

@@ -77,7 +78,6 @@ in {
   "osterei/restic/radicale.age".publicKeys                    = [ leah osterei ];
   "osterei/restic/matrix-synapse.age".publicKeys              = [ leah osterei ];
   "osterei/restic/maddy.age".publicKeys                       = [ leah osterei ];
-  "osterei/restic/oeffisearch.age".publicKeys                 = [ leah osterei ];
 
 
   "taurus/syncthing/key.age".publicKeys                       = [ leah taurus ];

diff --git a/secrets/spotify/password.age b/secrets/spotify/password.age
@@ -1,11 +1,10 @@
 age-encryption.org/v1
--> X25519 lHgKABGLrw4q0/ENXXNJDFHoYCk8d8htm7We5Mb/syY
-qz0x4/IT6MccxEZ3ytEtulahfNiAME6Kpu42k1aeP5I
--> ssh-ed25519 2LuoZg apsDdiAARkCAICAY7Zd16kT6U6x/n9W+YHlpUXqjfxI
-cnQFtFGDBo3+Yw82TPiZau+7QDMCxraeFqa2M8MmmvY
--> ulF-grease \5 U{cS
-jFNEGrVrrm6m4OD5UGKcCf137pQuiHUzyJxVSe/0ViXW9ftvrngawiAk9itZ5d4V
-jtZp+IgNYyTP5/O1143Q2kBHFHXqIKm9CbeJC01A9IRYa/Y36Kfw+Q
---- /e2Kl9OyLMUB8ZNmGE2ecaYPvZU9W+7TqPkmWnQH0Gc
-D]�ϻG(�<U~O�1����9B%y���i�
-�6�'��
f�^�3�Ϸ-
\ No newline at end of file
+-> X25519 1P4BszU5f63NAx2dUdMdbCYG1Dt71+P6tTjHUfeIpRE
+tCb7HxhgFOoXftiyq78r3xyyOOm2HPo30+ef5aQtiIU
+-> ssh-ed25519 2LuoZg WbLsK+GUypF+I33qb4zlj9ucLO68H1oILGkOSBaF5jY
+yJ620RiP7YR5fVGa/8ilOUcT9cC0dvOCylv2o9i8Lzs
+-> U<1+c-grease ;1AFUa1 F#{q$}r }}
+PnOCCF9t3H6jHt5wOpUcg941k4H2xL2HGk52Mwyw4zlgx/R+RPT6SAJ7EGC9H6Mj
+IR6fEID7YKWVYnmeVJugEZYbaFPgDew9IOPA3FYEhOjA2V8/7PAz
+--- RZLSkS/9HkinkAM7UCcqfO1WfntKJOF7W5sBtxb4wAc
+Szc잢>�,��܏O<�!3�����G!U�>�'�ΉJ�aٌ�F�߆��hV+
\ No newline at end of file

diff --git a/secrets/spotify/username.age b/secrets/spotify/username.age
@@ -1,10 +1,9 @@
 age-encryption.org/v1
--> X25519 mMXb3yWsVxYPEQ8oHkCPtEbcTiUwGwJP1ahwhAgJvUk
-BnTwlo9ZMT3FRTpZFGP2VlN6qVOys4u+N69if1wzmpU
--> ssh-ed25519 2LuoZg 5w7by8yErpBT32NPWv4fv5avaufyt4baOYmosnRt8zE
-VkYrfpTe2PewlejlKEpQvBypReuheTqqjdLFDhe9VKI
--> FVb"V9F8-grease
-pZjPnBB4cjoAJupw8Yw0ERKt/Yel+3C6zUj/DZWvZTNlJ/fKAoKyCsgC+WRHE68j
-c9sdQz5p09kxzMw0kJUgnc6wG+J0XK5iH9ehpT6jyAhirzS6qNsvUn2KbQapn+g
---- l61wMMBFzvutJ4IBsOAlCHk1YWdTNI5w6QJpS+JAjyE
-�[`���oVkUp�m3��4�a���h+�,��E�I�
��}~2�Whxl���-
\ No newline at end of file
+-> X25519 N5S7F0aPTVB0iGhbDXR4UNOFpRMdylffziX3vXvHxVU
+UdBUP3C9xVmuZl/+Bf7ad6CT9ag1I8lnlRl9NhFRBAg
+-> ssh-ed25519 2LuoZg mx7LGHB3P9JaSbPr9h4hQKCv9U4dS1XHPRW22St47iA
+fRzYgojJI9Ms2vGKmaU5msbMFH7AG3HZrKt0Y3C/VKs
+-> 8*[-grease 1&5y#P t.
+h+leMQEyVC9rZ6MWdo2Sxw
+--- g33YbhHH4O9TZdsPFT3aqCJ4KyuhuC/m+TjF+pjByTw
+��;Mw%�<�(�n��Z3௞~���Q����ݨh����Π�D�mN�/ ��^@7����+
\ No newline at end of file

diff --git a/secrets/stasicontainer/syncthing/cert.age b/secrets/stasicontainer/syncthing/cert.age  Binary files differ.

diff --git a/secrets/stasicontainer/syncthing/key.age b/secrets/stasicontainer/syncthing/key.age  Binary files differ.

diff --git a/secrets/taurus/restic/matrix-synapse.age b/secrets/taurus/restic/matrix-synapse.age
@@ -1,10 +1,11 @@
 age-encryption.org/v1
--> X25519 AVSTm6zPbY7fY1niC9WR7vW0TZDt9YltUj805MctYjE
-qemlBAg01GgQRE5HYhOArNXN04+EmHT+ptQqZAXAjRY
--> ssh-ed25519 qAHlAg l5mU0HfvJ2xwkfbDpSDlPf6TNwtVbjdSa6MbD1KuUxE
-KVULG6QV/tZEKjXfQ3G8x4DAR7Y1EDXlRqtf1nhVFKk
--> x#6a.-grease {o;#!$P3 <
-DzN8sYWHqPKgA1e8L0OdN2ZWUg8sHNVreFnqjAZMpd+wcY39H+aRLQ29RLs3Aw
---- iq5s5RZlHnZunQsFeBmJr5YO7PsNWHIpMeKoRqTc4Tc
-F�}
-��@>�ܣrؗ�,�y��M�@gܯ}>
����i��5{���#<���	*���-
\ No newline at end of file
+-> X25519 09j+MurMIFvCCtaicn5059K6LDflfzptTe3poNTihAk
+To0SMMzPkzCV48sRJaZgW+vEn3Y+BwUj/PS97iGt4jA
+-> ssh-ed25519 qAHlAg EsyHwVvbtVJ9ohkG2O5y6DQsv4YfXIKn2JKwV0PCqC0
+ixkJiPbiN75SM4cOfaDSOOzFjmOEc+CvxIw/6F+ZkgQ
+-> )vi1\-grease
+rralLFG9BiJtwziRyiBd+U8xfUHgI3lGcbid90EKAoqGnWwRFnbA3j+CgXWEjTYg
+gh8r9Q4/oV/nXQjyJl1ZxBjV8rMsmkal3mQwdKY
+--- bkeMbJYDaKkcnB5PgzWm/tuP8Y8K5Hx5cB7QkAoHR0Q
+`s�οp�A�MKԉ����nU��2�
��ϻH�
+����hf�%yM��W��e�f�ӣ�+
\ No newline at end of file

diff --git a/secrets/taurus/restic/pleroma.age b/secrets/taurus/restic/pleroma.age
@@ -1,10 +1,10 @@
 age-encryption.org/v1
--> X25519 b1HLB6XrUhSJNBDbEkJBmQDFqqxh+ksn9KKrdHO5BBM
-8t0xcgQH4mPRzQJxed3M44/pq+b/oMbPkyw6FXj0WmM
--> ssh-ed25519 qAHlAg dHf79eOepU00HxdcAxf0XxOyEp2v5A3ff09VTvjLwAE
-kE0ya3s4gwcSaa2Sxz6/k3oXdB6iGM7rgD3NkePwT5g
--> \i$$B'A9-grease Pe ozV]"`I
-8Uq/ofKgN1o8i9GF3qeNeriWtcBVzVrHUo7XZ2Un82QlOqqObOcZYVCxjnb8DuXV
-0X13NrfcldBm2qG58mqx50E
---- 8Yj6A8NDMqs2YT9stKS+22UfdN8qE9rVOIPBoJmEvTc
-�ғI�@�y���:
ʰ���S�u�Ey���Z��w�/��a�p-5�{�uD5��>�]�<�-
\ No newline at end of file
+-> X25519 a3L1SY4SC413wP9mg4XL4tS1Itwb6tvNWm7GJjh8/CQ
++5XRaomE4ia6wH96ul036rMSk1Qao6Kk0Sp0DmPFItw
+-> ssh-ed25519 qAHlAg 0JteQs2hvS5hbENmvokmvWc4uptNUZRowItrHoVt/Wk
+LMgEnxhuALf8Mi+fF4Hzg6Y5zAM5SSecu8LMY7iaBj0
+-> Jz@2E-grease + KU JHg[>TW=
+qMoS6CsyE5XTUYr4tbN7FvuY+fyouUyPcL6XT8/NVWc8fHhCshXhOHOJmGEsAHKL
+tUdgqkiyMW7SNyXM/UFToDFyEzNjYLqJN5/99gZhjKK7S1SYeT++Kg
+--- LY2IeKIhS3Nx4KxnPYrGDiAAjHK+yrEcF03EDeW1b6o
+�7�)$U���ۯ�,0�mg���J�;sw%N�*�q�d"��d�
�?�}T�E����ߔ/+
\ No newline at end of file

diff --git a/secrets/taurus/syncthing/cert.age b/secrets/taurus/syncthing/cert.age  Binary files differ.

diff --git a/secrets/taurus/syncthing/key.age b/secrets/taurus/syncthing/key.age
@@ -1,11 +1,11 @@
 age-encryption.org/v1
--> X25519 DJIFgE7av+288RDpVoY3ff7sKSKZdXSu5cJlCIUQ9Wo
-JQbIe9MpmAYrhFW7evrbv5EwinV/84Vxzbq2ql+DRx8
--> ssh-ed25519 qAHlAg WyFwVuxv4dVEUdZ/aM0CYnWuk2nLup9kelYzxspvvW8
-7QCHuY1SWCuc7FuIymwCLhkCxMXxfSZWdeE6tQy5C1k
--> 0M#xNne-grease 2w=H>pY1 R sbG JuF<za&
-br4WTioqOgxgWZU55gBfAyP+ntkpfhnLZp62AvFW45SdpPNwvWf3ZwCsklvnoEn6
-qVDBNalo4loIYFOR6u5fXLN+xa3iyUo
---- 1Ein1m3y9XP6Z1XnL2AocnWXyKGpGsQvobyHdsDMSt8
-�޿*��y�}KAc��o�mp�u5|aa�	�B��f	��c�;��{۲P�*���U�ǻ?IWf�~Too������'i�7!Hn�{W��S�-�0ATueE#Ym0�6u!���gL�*&�n̗7�N)��{Xk�HX-���$�5{vԦ{�\�]\�E�Ｌ���kg�^;B�;�y��>3�
|w\X���c��Iͬ���{<a4n(�nɥ�q=��2��j,(	m�
-C�>9Ϟ���u��$]IH�%���K���*���šP��Şj�ψi�IZr�3���2˙�T�����d�ͨISk
��)�^x|̈'C�\V-
\ No newline at end of file
+-> X25519 8ByygtRlBrwlNFP67WxuwDTDsPuCdZq43NTdYb8vfyc
+jEwixLDIxXSgaRtK/BbqY/TwmykUp+OpheZ9mexAGG8
+-> ssh-ed25519 qAHlAg 3z8RaR9AW14ei23btPeDlMKbbXzZjIxjEGwzof30eDU
+zOypFetmtnuptYsl9a6JMVQ5ZhnJcymRRd6coc1N77Q
+-> Bb-grease `3"q9 u W^_t&,uW #4
+HZYHBmX0ctH7FSta9xzLRfXP4SLBgXoTMuaO7HiT6WH1l7zPZeqziOUHR7ORVeE/
+0QFMWLPGww
+--- T3vddUoDxDkXc6Le29QgElPnFcKqdnHr1aPXNHesFL8
+ ��1Bq��IMf��5��l�tL�Τ��Q�C��Dy���K�~���G�P�����sQ�py�/W�3V�"�ArIQn���)˰�
+NA�v���4�C�HA�_R��;RC-�.��ފ.>��Pd��z�Q���o�}QZ���Z��RXV�1F�6�i�8{ҟ}�f�64-ǎnQ��
t��J�V�JlZDL��oI��D&9
�P76�AI�0�h�4��;�$Z�^�$?b�!�jg�����K�����[����>�u���S�\oȩ�Ң�7��˾M Lμ$��.��%��ءH�l�Wa�R��ϊm��V�q+
\ No newline at end of file