Merge remote-tracking branch 'origin/nixos' into nixos

secrets/moritz-password.age

@@ -0,0 +1,11 @@
+age-encryption.org/v1
+-> ssh-ed25519 wG6LYg LK0u1kmnMlRkk3s1nqpHREr0pbtQwc+Or9XFGSk5Syo
+HLc3gWskZTeWfMPgR+EBn3R3ycn+7rWKgheZuP4o9Tg
+-> ssh-ed25519 ZYd7Zg w8wh8buUNQcPdihFgWVyZfCg74x01YTSbnj8Sw5dhBQ
+i8/rwKnUn2QIuTpLayg1+SzUnHbpOu7CdhAnO3u3/VU
+-> ssh-ed25519 CjuqfA FPR6pGls0nRXB7lFUagHCcY39iuoSBab+T40aMuD8hQ
+pyrcWA0Knw0iZf8CpfvmP5hsJf0Gba9LBKSQO1yGfbQ
+-> CQVJ}-grease pf }&%
+7Q
+--- Mn5qor9GWHRU52zTv+kCqQljCZYsG1tO6ekZSH/p1yc
+ÖÉôJžåODša¸õ0Cµ¼c´ rº<72>X *ú…F\uãÄA‚ÎFOƒ<4F>ÔsKù‹t–<»ù(œ5¢JÛMTD¶<S-iÇ–1ã7–Ó9™<39>ä[Çhqr>ÕÌv²Rãõµ?Mþe

secrets/secrets.nix

@@ -18,10 +18,11 @@ in
 {
   "github.age".publicKeys = all;
   "ssh-home.age".publicKeys = personal;
-  "ssh-builder.age".publicKeys = personal;
   "uni-vpn.age".publicKeys = personal;
   "wireguard-preshared-key.age".publicKeys = personal;
   "wireguard-private-key.age".publicKeys = personal;
   "webis.age".publicKeys = hosts-personal ++ [ scadspc25 moritz ];
   "webis-ssh.age".publicKeys = hosts-personal ++ [ scadspc25 moritz ];
+  "root-password.age".publicKeys = hosts-personal ++ [ moritz ];
+  "moritz-password.age".publicKeys = hosts-personal ++ [ moritz ];
 }

secrets/ssh-builder.age

@@ -1,10 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 wG6LYg 5umyOPP+KaUaQckEZYnh+nyX2RIMDp/KtJraFuATQBM
-qsS9JiY0qxR7IMwpH2x1VWF5A5/wrAkbeOzuMcf1fS0
--> ssh-ed25519 ZYd7Zg L9EJulnOPk7fEcmrWU8mVRbEN80dHCji1n4bnwGJigk
-KTnk+Ku96gJ7Tj2egXyqX6UIuytHTuMFM1ygDXoIDxg
--> XQ.ai[-grease a ) r]>2~U
-7CDc3c+1EZaEB15RE8JMzmdbr2WmQeP2ivIh4qgYTnKImHxJaJEhgScd0EzyEXVP
-NZxuP+0
---- CE/X6hjRUWT1ya1ySIjFBnLdmPkVbL4ugDwYv9XGYoo
-Úô½çµß‰¦¥×3Ïÿ8ìež:Im…èúÔF?U¨~Ù83ÍÉÜóÝðµôìNC<4E>zAÅãõúû°õM]0¥²fšð´ku˜›¯†<C2AF>FL§lš<åÀSXCÅÛhEh<45> Î¥GKF<15>È<+çÒoŒ_<C592>ÝÐIP´ùça<vJ<>SxzŸÇyࣖ_\ÿ<>8p‰¥æ0‘v