secrets: reorg user-specific secrets

homes/aly/secrets.nix

@@ -1,12 +1,12 @@
 {config, ...}: {
   age.secrets = {
-    achacegaGmail.file = ../../secrets/mail/achacega_gmail.age;
-    alyraffaufFastmail.file = ../../secrets/mail/alyraffauf_fastmail.age;
-    backblazeKeyId.file = ../../secrets/backblaze/keyId.age;
-    backblazeKey.file = ../../secrets/backblaze/key.age;
+    achacegaGmail.file = ../../secrets/aly/mail/achacega_gmail.age;
+    alyraffaufFastmail.file = ../../secrets/aly/mail/alyraffauf_fastmail.age;
+    backblazeKeyId.file = ../../secrets/aly/backblaze/keyId.age;
+    backblazeKey.file = ../../secrets/aly/backblaze/key.age;
 
     transmissionRemote = {
-      file = ../../secrets/transmissionRemote.age;
+      file = ../../secrets/aly/transmissionRemote.age;
       path = "${config.home.homeDirectory}/.config/transmission-remote-gtk/config.json";
     };
   };

hosts/fallarbor/secrets.nix

@@ -1,6 +1,6 @@
 {
   age.secrets = {
-    syncthingCert.file = ../../secrets/syncthing/fallarbor/cert.age;
-    syncthingKey.file = ../../secrets/syncthing/fallarbor/key.age;
+    syncthingCert.file = ../../secrets/aly/syncthing/fallarbor/cert.age;
+    syncthingKey.file = ../../secrets/aly/syncthing/fallarbor/key.age;
   };
 }

hosts/lavaridge/secrets.nix

@@ -1,6 +1,6 @@
 {
   age.secrets = {
-    syncthingCert.file = ../../secrets/syncthing/lavaridge/cert.age;
-    syncthingKey.file = ../../secrets/syncthing/lavaridge/key.age;
+    syncthingCert.file = ../../secrets/aly/syncthing/lavaridge/cert.age;
+    syncthingKey.file = ../../secrets/aly/syncthing/lavaridge/key.age;
   };
 }

hosts/mauville/secrets.nix

@@ -22,8 +22,8 @@
       file = ../../secrets/spotify/clientSecret.age;
     };
 
-    syncthingCert.file = ../../secrets/syncthing/mauville/cert.age;
-    syncthingKey.file = ../../secrets/syncthing/mauville/key.age;
+    syncthingCert.file = ../../secrets/aly/syncthing/mauville/cert.age;
+    syncthingKey.file = ../../secrets/aly/syncthing/mauville/key.age;
     transmission.file = ../../secrets/transmission.age;
   };
 }

hosts/petalburg/secrets.nix

@@ -1,6 +1,6 @@
 {
   age.secrets = {
-    syncthingCert.file = ../../secrets/syncthing/petalburg/cert.age;
-    syncthingKey.file = ../../secrets/syncthing/petalburg/key.age;
+    syncthingCert.file = ../../secrets/aly/syncthing/petalburg/cert.age;
+    syncthingKey.file = ../../secrets/aly/syncthing/petalburg/key.age;
   };
 }

hosts/rustboro/secrets.nix

@@ -1,6 +1,6 @@
 {
   age.secrets = {
-    syncthingCert.file = ../../secrets/syncthing/rustboro/cert.age;
-    syncthingKey.file = ../../secrets/syncthing/rustboro/key.age;
+    syncthingCert.file = ../../secrets/aly/syncthing/rustboro/cert.age;
+    syncthingKey.file = ../../secrets/aly/syncthing/rustboro/key.age;
   };
 }

secrets/secrets.nix

@@ -17,27 +17,27 @@ let
   userKeys = builtins.map (user: builtins.readFile ./publicKeys/${user}.pub) users;
   keys = systemKeys ++ userKeys;
 in {
-  "backblaze/key.age".publicKeys = keys;
-  "backblaze/keyId.age".publicKeys = keys;
+  "aly/backblaze/key.age".publicKeys = keys;
+  "aly/backblaze/keyId.age".publicKeys = keys;
   "cloudflare.age".publicKeys = keys;
   "lastFM/apiKey.age".publicKeys = keys;
   "lastFM/secret.age".publicKeys = keys;
-  "mail/achacega_gmail.age".publicKeys = keys;
-  "mail/alyraffauf_fastmail.age".publicKeys = keys;
+  "aly/mail/achacega_gmail.age".publicKeys = keys;
+  "aly/mail/alyraffauf_fastmail.age".publicKeys = keys;
   "spotify/clientId.age".publicKeys = keys;
   "spotify/clientSecret.age".publicKeys = keys;
-  "syncthing/fallarbor/cert.age".publicKeys = keys;
-  "syncthing/fallarbor/key.age".publicKeys = keys;
-  "syncthing/lavaridge/cert.age".publicKeys = keys;
-  "syncthing/lavaridge/key.age".publicKeys = keys;
-  "syncthing/mauville/cert.age".publicKeys = keys;
-  "syncthing/mauville/key.age".publicKeys = keys;
-  "syncthing/petalburg/cert.age".publicKeys = keys;
-  "syncthing/petalburg/key.age".publicKeys = keys;
-  "syncthing/rustboro/cert.age".publicKeys = keys;
-  "syncthing/rustboro/key.age".publicKeys = keys;
+  "aly/syncthing/fallarbor/cert.age".publicKeys = keys;
+  "aly/syncthing/fallarbor/key.age".publicKeys = keys;
+  "aly/syncthing/lavaridge/cert.age".publicKeys = keys;
+  "aly/syncthing/lavaridge/key.age".publicKeys = keys;
+  "aly/syncthing/mauville/cert.age".publicKeys = keys;
+  "aly/syncthing/mauville/key.age".publicKeys = keys;
+  "aly/syncthing/petalburg/cert.age".publicKeys = keys;
+  "aly/syncthing/petalburg/key.age".publicKeys = keys;
+  "aly/syncthing/rustboro/cert.age".publicKeys = keys;
+  "aly/syncthing/rustboro/key.age".publicKeys = keys;
   "tailscale/authKeyFile.age".publicKeys = keys;
   "transmission.age".publicKeys = keys;
-  "transmissionRemote.age".publicKeys = keys;
+  "aly/transmissionRemote.age".publicKeys = keys;
   "wifi.age".publicKeys = keys;
 }