fix up secrets

secrets/cloudflare.age

@@ -1,15 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 Kfdnog HMpl/3mb59SsUvkDXXxO+odBNSc1dZS1nQtC8/BPlGI
+-> ssh-ed25519 Kfdnog gEZvRtLBhGslmS97VaRqoucgExvOopsHAAne4lCmEEY
-4fPk0YtGxOoqXDfTN9kQlH0Pg2iaJXUZE5es6f317L4
+NkIeFYuQFntDOBqd3k0/OVYMcM7h73uO0jPXaHzEcZc
--> ssh-ed25519 SP9f6A p1kh6UOFJ4xwulLY9IpbNZIJ7JSouR27j6HgK/XRegM
+-> ssh-ed25519 8YSAiw bVV4jIDbBKxsr6mQ4Tv0rP6ylrAEOJWkqjpyvXjnQRU
-rJCzN+RCdQgo/xCkAmcdN6GfXsoQhpmE1HuGwYs/2CI
+6kUe5Syw7sd+aF2QEgr6Yj+fOPL5zSJN1PJvY9Kdhlg
--> ssh-ed25519 8YSAiw cCbMOE3PMa3bzGGQSeQZuq074iwt4p4HLDu8uiHhWRY
+-> ssh-ed25519 J6tVTA 4JMlJmhHAYUgjiWwB1Q278TSjJypwecALmfnosxan0s
-U6wR/DuBdMKfbmQfUZ8XLdTBxNsUMR2lOueYucR5+bY
+WIubcIFrjMV0GpyU1ZGc48YwrqOtSmJxweonw1KnR+U
--> ssh-ed25519 7cojTQ iLDzC79YtZcrqldzCyIFHrpsEapOXYD5AXuNoQ+3ulI
+--- 78A7re4LLB/0n5AXLRlVqiMNFMAQ2ZvjjK21YGRveRE
-v2NiE3pA+J8Po+PqTTUU9XYKy37AIyj5KWdlh7FOPG8
+ú_‘4pk
VCKmÈÊ#~kIô<49>8Em3ôkºp|Ó0^÷tSk<53>És¬/øÃõÎ…?= lÔ,„‚Ž<E2809A>ì²7âã~Í„¶cû{ãÈž¨AªÝ­ø‹Œ>Zã’Èl¬§—GTJs²GYŠ´—/Ëö/×B4ÃeŠÑ'óðIIÐãcÿ
,"‡<Ÿ
--> ssh-ed25519 J6tVTA Jw1pSpF1J2Ud46BDhdRCPErgUeim8uwWxiB1E3BiJB8
-hGdGFi46iqKJN0QviG1xRNf2kwlls0rM5k3LkAiw8jY
--> ssh-ed25519 Kl5yTQ yXnKCsJNjTSQYiPuv6dAF6raB3EFcg2oag1cBVkdvwk
-0hwjrZpclTrFWtr5JqAbwXImYzZwTJOJPkhNnlHmPeo
---- k97ZU6FfTWVqBwNcrF9QeEbnqnuQUQ9pR1qM/Sgjh7A
-#Ž©L-q﹋hr­÷&§ý*Åáh¢¡NÂb®›qÒܦHÅ G=@öâ¿uak”u’|ðEù‚™r^£BOoÔ}:Æ5ju€Å$%®¼éË".A1ÿäqŽP\Œ2CÏäRŽÜ¤¨‹¶_	Sû²‰=”(Æ%sÞ¨†ó§Çï£ß

secrets/nextcloud-adminpass.age

@@ -1,13 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 hi+lKA KUVC7m5ch8uuseBHHPCspWWdSAs+3YK+LvBL7h14UT8
+-> ssh-ed25519 Kfdnog aE5/4P3r4e4fh7fFYI+0ci4n5egCI9XxMUsVUQJvmjE
-8h5Tu47UJ/6wJZaEjB0KhUKZ8yw3FgwWv9Dem4ivgVI
+ILlTNB342CLNpdX8SEnSnzEqjvSj8smDjGBQXjQ3pVc
--> ssh-ed25519 SP9f6A IDnNmcjBKTiNWnBPw7mAuycOfzvj1bGi30OLi/mN+AA
+-> ssh-ed25519 8YSAiw tedtmECa3YP0wjOZsCJKAU/izbPcPHWnL++PRSjBIA4
-xE9drPCFvOi8v74zqUuCOc9DOFnzfwFfoa0O84JHonA
+Rk4E8SbG5ThaBKvtOEe+MWB1JrzFnQAgH/TJGv3+hT8
--> ssh-ed25519 8YSAiw vWnYElIL2jh/LmxZKFFGE/8H1o+bOnGsGxQ3UZ02FE8
+-> ssh-ed25519 J6tVTA gozo087SB3PrKK3dTRpmLfUH+pWA67TEHJOmgj1+ASY
-c6e/c1a1cUa6FPDaUYHeY50WB5E1cq398AgwVs421EA
+pdLnZWvQHyN9lZuS4jjvsnGne+TMZ0PagvfvQJXJW2w
--> ssh-ed25519 3Chb7w iDSXb9BYJ/2EUJx77Uch3eFYukxTD5nHbdU+iTBWXkk
+--- hJpVSU9xNlac99VD26i0uW6Jw/U/CoOcAwHSUCk0acs
-QBrCOSmjKeX0giQxYGMHinOeTrDs9ZGmdjThxEvyXn0
+ß?ühÊÆÍçšÖòÐ)Ų
®åýIì<49>סûЇKx•›:¯:<‰²J
 ÐBV“üåâöMÖíxœñÖ0L
--> ssh-ed25519 J6tVTA tZ5yMoYaLdgs0WoaRju3h+zfKSCrYoYO7aDcmnNta3s
-seYPrbd8PmVZJKSltp4qI7i137be01ydWhkdOPP7Zzw
---- LElLg1Mrmw0iExirSvb6KWSA8bugbVggM2RwZSWlWGM
-]ÑèÍ lÛ0ÉðêådNðnõݾ05‹‹é7ÛË8qƈKÜÆŒÅ_#Ì“aÔgXDC:LÕ6̾R·é­§¶

secrets/secrets.nix

@@ -1,29 +1,29 @@
 let
-  io-user = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO3Y0PVpGfJHonqDS7qoCFhqzUvqGq9I9sax+F9e/5cs";
+  io-user = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO3Y0PVpGfJHonqDS7qoCFhqzUvqGq9I9sax+F9e/5cs user@io";
-  io-host = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKCIrKJk5zWzWEHvLMPMK8T3PyeBjsCsqzxPN+OrXfhA";
+  io = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKCIrKJk5zWzWEHvLMPMK8T3PyeBjsCsqzxPN+OrXfhA root@io";
-  io = [
-    io-user
-    io-host
-  ];
 
-  rotterdam-user = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA1v3+q3EaruiiStWjubEJWvtejam/r41uoOpCdwJtLL";
+  rotterdam-user = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA1v3+q3EaruiiStWjubEJWvtejam/r41uoOpCdwJtLL user@rotterdam";
-  rotterdam-host = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIjXcqQqlu03x2VVTdWOyxtKRszXAKX0AxTkGvF1oeJL";
+  rotterdam = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIjXcqQqlu03x2VVTdWOyxtKRszXAKX0AxTkGvF1oeJL root@rotterdam";
-  rotterdam = [
-    rotterdam-user
-    rotterdam-host
-  ];
 
-  alexandria-host = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK95QueW+jp1ZmF299Xr3XkgHJ6dL7aZVsfWxqbOKVKA";
+  alexandria = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK95QueW+jp1ZmF299Xr3XkgHJ6dL7aZVsfWxqbOKVKA root@alexandria";
-  alexandria = [ alexandria-host ];
 
-  trantor-host = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINkGuGLZPnYJbCGY4BhJ9uTupp6ruuR1NZ7FEYEaLPA7";
+  trantor = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINkGuGLZPnYJbCGY4BhJ9uTupp6ruuR1NZ7FEYEaLPA7 root@alexandria";
-  trantor = [ trantor-host ];
-
-  desktops = io ++ rotterdam;
-  servers = alexandria ++ trantor;
-  all-hosts = desktops ++ servers;
 in
+
 {
-  "cloudflare.age".publicKeys = all-hosts;
+  "cloudflare.age".publicKeys = [
-  "webdav.age".publicKeys = all-hosts;
+    io-user
+    rotterdam-user
+    alexandria
+  ];
+  "nextcloud-adminpass.age".publicKeys = [
+    io-user
+    rotterdam-user
+    alexandria
+  ];
+  "nextcloud-secrets.json.age".publicKeys = [
+    io-user
+    rotterdam-user
+    alexandria
+  ];
 }

secrets/webdav.age

@@ -1,15 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 Kfdnog 9oKx6Oz/J/QJ0mmgoLX5AUx0sFdxnPVnjF42bElPSXA
-BJ6h4lHGDsf1Npc4bwkvz5htGRT/x/b2bs9WFM2W/pc
--> ssh-ed25519 SP9f6A T5t4apynXLYN/4YEvaHRCI28rrKzet4r6LrbAye5VGk
-BsXkZYBxG9zcfLYCd9H0+LW078oCDyYx9zG+DPfE7bA
--> ssh-ed25519 8YSAiw RY0YR30qyJPvhy7eTJLoj2JXpH9qHP43fJaHilJykXM
-E5/P0Egz/LKwEhYLYd5Cnrat47gnYn93yDSeYgLi934
--> ssh-ed25519 7cojTQ qTCTw7CjilThFLmXYph4YhVBhnk1DpnFCGwgioo/XB0
-N31nZ8nInQuddLD3b0bxI5Es/pTvTQD8nz0f/AZtNFg
--> ssh-ed25519 J6tVTA 7OawDsWwtVxu76ZgF0dFclMr19sBNdtu7H+Tr7Pd+SQ
-hhVKcscIKIH1WChhRo/RYqUWy1rgs/EKnlHr9uY7QrQ
--> ssh-ed25519 Kl5yTQ +i2Q3uNHw1jAVH76NHy4QbjCc6sBBYjsbr7w4mLaHW4
-JOJ02zU0+IxlbXMBsW4UrvzvLUbifdzABBNL+bc0bBs
---- W40oEFdBUKbi0teNTc6B1sX0ReHDvkIJcBm1dlROnk8
-zÒ¼ÆCnçç®±àÈeÓ­ù7{ïÛé{Nðì§ä³6ê•azÁ‹"ÒÉE¯HB/¢BYbD