improvements

secrets/mail-lukas.age

@@ -1,11 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 SFHVrw 3JZ4vApGhqF9iRQvfhkg8gIonZLGrBp9i9E1RZM7zn8
-3v08N6zWIuEIs+bt2GeWF60it9sDE4E2+hgoTbayv4k
--> ssh-ed25519 S+dwQQ NfiaomfNXA5cJKzdPWJmJlHK4r2ZN24E2tymgROlogM
-29EKJivtkdnWOtTee56peTOgEjBM4gXVSlzUekBUKZU
--> ssh-ed25519 5IO6QQ DifPg5bQ5C0h2URSfei3NV+sfBkeNs6tz/OSJzACcDw
-yV4UkgUsUUdZOpPoLgmJy9sJIrHIN/5esobFFJfsMC8
--> ssh-ed25519 ffmsLw 1/Ur807TPTjuapdynnicK8k2ACiMRDZ4CQpgAyiAql0
-9/4FKZqBnk2Q/VY6j/UOCuwUpbwmOMrhNh7zIdRTvqk
---- PXMswgq0lbERBdFOFPnc48j3r2t9aR3+SPenu0karWg
-ª‹ð~指2¼0¥<30>Ž“£ö(º©Å(C•¤ÊΡ_W#å™äýW˜¾ŒÊNâIs·Rpý7¦´4JÔ<4A><C394>¢Û	ïÕ>Äc—p"
C8¿+7:µ¡¯îCÆ“ìJÈj»
+-> ssh-ed25519 SFHVrw LiDCAhLHNnb0AbtKaSxP32Erwaqpm9rkVqqTYsg7VX4
+rgZBcTW88Zynex2AWXHpJ5VdlLAe3MtNN4vRhV03/yw
+-> ssh-ed25519 S+dwQQ b1tjzc5ipNB1O5+sj+NTdPquv842V1SNfVLwlhllpmo
+q0KI/Rb1D359bRSsrwJrG0Sfy7YFe1y2qZZY6e5SySE
+-> ssh-ed25519 ffmsLw OLoQCT99w3kM1wyzCWGeh6tO7fH46GbIzLSWJNxA+V8
++hfzOs8JPE5/Paag/7PkIYmRG8ppJMouvxDcyyfrzv4
+--- Q2ZHMtaw0pwEOOGBxnRRNzjfEbcQqzP82QNFPRgazGw
+°Dź$|dtÚSł}NŮŠ{ß`vçÓb‘«Ű†şfĚȡnü¤5””‹
ő<>ßťR*O@ŚŢ€Xw ‚óyŐ×–ĺj?Oë4b¸łÔ Č÷©±Á]8N|+%

secrets/nextcloud-lukas.age

@@ -1,12 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 SFHVrw F1EZXe0gnSNWIhPqxkSPLUpU7yROj8mSClFjFjpvdV8
-4McyaDtxvEOI9CBLNMEimnFTtXGoUcVzfQ3zfmMl3o8
--> ssh-ed25519 S+dwQQ WT+jOjytoIKg2cPlD1bchFYaKxTJ63nixignaTNOqBM
-kf5FYspdW859XaZL+mbnkchoUg4mFONuV8axas7RuLI
--> ssh-ed25519 5IO6QQ b8cU+T+50PZ24o2YflQ9EEojxHDdnB9hlPdcggruhHM
-qPjpL4q6+0osKkseBlY0ACSZbnhHoPo7RMP31t7l/T4
--> ssh-ed25519 ffmsLw 3Y8iqWTYOJUCNexfOkd3QfG4P5onmanDbh7gdUPYwzE
-smKtEI17pzGvXkiJT9jC4hoECCHm1sEd7rEu92BUBSY
---- BEki7iC6CxE/6NEdkkjAVkBKgO5nuxqLxRu4JiGBcaY
-äè\zésGÆž˜Œ¥<C592>­z›—Á¬¬˜3òVR®Ó”Ý
-¯ ’•&ÖXq0	;TK
+-> ssh-ed25519 SFHVrw jUO5Z4j1ADd4QMPziuvNDh0iUirvrV32Z1+xbnkoVks
+FJGle7Kr6knbPrgCg6Lk1ge+jV7Im4Z8FAmkQKlP6Ik
+-> ssh-ed25519 S+dwQQ wKH3jZM/aruNPE5tYSROFGUdXw2o3lws76OvAXubhxk
+Jhv2kqxgHM26iuvDs0LTf4ahlaiRacN6wpH7iHuknF4
+-> ssh-ed25519 ffmsLw kNKHrTEm4pFyC1r6Kjah3pl+0xnTuFt9ccha0uh0Z3Q
+bLP4RrHR5gUm2ZuFNcK2m6tnC24PiGdevnuNTQ9Kb0g
+--- FznEfHzpAG79LYYxIBJYgCFeUrb9Tn9yS5wXfJVeeEU
+µ+łß†cä8:vbT]4$\<5C>)Đ„şš[TŻ@W;”FfĎĚÂNâčFÖ’G

secrets/secrets.nix

@@ -2,18 +2,25 @@ let
   users = {
     "lukas@flamingo" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAztZgcRBHqX8Wb2nAlP1qCKF205M3un/D1YnREcO7Dy";
     "lukas@glacier" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK4U9RzV/gVGBfrCOye7BlS11g5BS7SmuZ36n2ZIJyAX";
-    "lukas@scenery" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMC6vIcPgOHiAnG1be8IQVePlrsxN/X9PEFJghS6EcOb";
   };
 
   hosts = {
     glacier = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHrKpoDV/ImivtTZVbSsQ59IbGYVvSsKls4av2Zc9Nk8";
     abacus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHoUgClpkOlBEffQOb9KkVn970RwnIhU0OiVr7P2WVzg";
-    scenery = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEHDS4LGl73WhC7NSzFe0ghZ0EwLjuP/43GGS65pPpu0";
     vessel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKkYcOb1JPNLTJtob1TcuC08cH9P2APAhLR26RYd573d";
     flamingo = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIInV+UpCZhoTwgkgnCzCPEu3TD5b5mu6tagRslljrFJ/";
   };
+
+  desktops = {
+    inherit (hosts) glacier flamingo;
+  };
+
+  servers = {
+    inherit (hosts) abacus vessel;
+  };
 in {
   "user-lukas.age".publicKeys = (builtins.attrValues users) ++ (builtins.attrValues hosts);
+  "user-guest.age".publicKeys = (builtins.attrValues users) ++ (builtins.attrValues desktops);
   "mail-lukas.age".publicKeys = (builtins.attrValues users) ++ [hosts.abacus];
   "vaultwarden.age".publicKeys = (builtins.attrValues users) ++ [hosts.abacus];
   "nextcloud-lukas.age".publicKeys = (builtins.attrValues users) ++ [hosts.abacus];

secrets/user-guest.age

@@ -0,0 +1,12 @@
+age-encryption.org/v1
+-> ssh-ed25519 SFHVrw XwFbvZ91rDE2Ux6BOxWqa0tpmp9W93n6c15WewMd83g
+bHU1wwzxwEc2Ie6KcGBWhRv2IeQDKEtzWpRSujPvzLk
+-> ssh-ed25519 S+dwQQ O9Nd+LXDcf7fP8xgqcmVpM44LEk1KaB8p9RHRfp+6Bw
+LOmhTxVX93XgM6lmr26MrNOMG2jf0ZAOAMiYR7KxRro
+-> ssh-ed25519 d2fKsw 5jpAhGTQ7VqJrT7SWfaAudYrVtIFYRRv1R5FgL8FeCs
+rRJe5oiSVtjPBGTJOdgFTXOzld0SxKpqAtXz7hHgB6c
+-> ssh-ed25519 US6ATA jol1HBmQUl3qjxLkSOZ17r9dqxu7lB/dDBqrccuq4Qk
+EyPFGHi1jI2fIRCourzGvvMJGQYsAjttEGiOUachi9Q
+--- lhZyqOVkSJS/30/cyWdLTVNMltAIHYF4DOIyK32VR/0
+ò›¨500
+=0ëþôMÃKÇF¡ë<TEãtK$?üÀ/QÊ~
/0i¦:è}Ò3×Xlì<6C>P¼QåZe*ëŠ<C3AB>çg8<67>_|¥ËíHã0;ê³°'êpS3ð˯V”)p_>Øu’

secrets/user-lukas.age

@@ -1,19 +1,17 @@
 age-encryption.org/v1
--> ssh-ed25519 SFHVrw /QFzbfKzJnpIMXadEiDJyQJneVbQWwaoQlQ8B85mFiQ
-0pH7idWoz/hQFa9lsdJoc3vN36znranVkOtiGaQpCxs
--> ssh-ed25519 S+dwQQ /4ZF8giAG2BGML1Fy73ucSb4jZK0EDgAmgj05ymbJzA
-lVi9ad3aPL4G/GFS6eAcxdJ9jDHWco0m+UHTOfkfNbQ
--> ssh-ed25519 5IO6QQ mPE6sTVXzyVe6UdKhhmFifaETPcgTcNtn2Ybwf+nQyY
-Zh2PzFw2zP/MiVpqRLANXe9jGj4GdtnyOxBsDemgoM4
--> ssh-ed25519 ffmsLw rj8FVCxSa49C30ZNW+gKlHXj5fOiTfHuecfumr0TTWo
-JqzlRhRXMgdzmn8mic7CFzLfMHPHbH0q7Vo1dB4byaY
--> ssh-ed25519 d2fKsw +jbHllavLuC5zykfwzCe3r7c+4mEn3D6FmFdgAKWCz0
-lkwdDPkFxlXlwwZ6cvJ+AxgtGqMvNtO9/PdNPjhYvRM
--> ssh-ed25519 US6ATA PKNAfoRfY6MfnRLSOUAhX1EDpXNbPC8EVTtNZ1KoIEA
-6rYHtwcdt0qXJr9S8UZ/q3xmTo416sY2unOlnN+/oa0
--> ssh-ed25519 2ktApw uDF57fuv7fq+LlQm93McI8xsBlZPDimeI7uXajXC9iM
-gr7aVLkhgZmyv0Q7KlHEJt370NeWXH22A0Avns7mN6U
--> ssh-ed25519 Sm0lOA t0uGXeSo6JhBQh5FsH6Z3ZRR/eEm+MVwSyS8TVDj+kg
-2aSkF1Hk8NGdNh2RNlBByGgBasKvLPhhdDQRmHe/fUc
---- x+N3g8ekH9yUa3vXP/2u4PtCeVKMEJLlEaLf2Nb1vHo
--3ÉOïIgÕ)ÿM7c©yÿ9(¥õi,Ezr¡,Â
aKºÔ°zb<7A>àU­3<C2AD>t]"™{Åô*t!Ó‡á(‡3Üà…`×yêlU;Ô[<5B>8fá—>E”É›mUä2{+ÝTk¹^áWýàúÙN,]d¦ƒÖ<C692>íºQõ»©û
:°ì»	ШÝ_ò
•àuú
+-> ssh-ed25519 SFHVrw RbCDTFm8etGA6wAA26l52Ezrj5g151L/uYmkCC57rh0
+az9uaQvCJy8ocB0ij+qmu1MayhkFYVK2NHvlB0+8RhA
+-> ssh-ed25519 S+dwQQ xUmmLtRfmdxSWv9sU2OIgced3+hn6H2fvHxtlrThF3Q
+hr3tB+uqcv3JNBFyjf2O6xanN2hnlbCdHH5wLidcbfk
+-> ssh-ed25519 ffmsLw NxXG3+tjYTxrAnZ/gIy/E08ozfSkl2GbUaaCAextd1E
+fKwGEIu4I1sczSvu2bsGcMZSkuYuO5gWFRyg1PoLfV4
+-> ssh-ed25519 d2fKsw glKuNTvDZxE7SsxBKP+0P4Ldl/a4MwvpzwkgbqFNuEM
+8XqemFkix1MjVJm42fQ0vtWaxiFGZWOer+OoRaVLccg
+-> ssh-ed25519 US6ATA J5l4UYEZVCUS4J69YTwEyTdFvPRoWlpp88iWgEEDe0Y
+ogUa74Vg22CN2zyDZzIoxUokMVPXzllfb1Vj53/CbmM
+-> ssh-ed25519 Sm0lOA 5YoOeiPiEfqT9mWUTSUusm9h5CceeeCVJS1iofooTHw
+A47tIbHSaQzaxrBatwqQEE2JIa67sqMlstkDyWIuE7Q
+--- QzbsNPZn7A5mPNUXOkkSZYt/mx/KrLiBHtI4wi2ynLE
+¨pç<GûÌþ¿è–ÅUlûäC&ux‡
+òÏFËä­éðKw“í7jv|¿·T\œ„ ¾®˜Äà	;R®ƒD¶—`ÂQ|\ˆë:
+v5ÑcõŸÆärDxáÔ«Š`à4#ñ,åè¦,Ϭ#óo•Ùkl²¢a¡Øtu*úËPÎ
Üée=6‰e®âS