From 613b56522767c490b37d231a9dae621cbe8e41f8 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Thu, 25 Jul 2024 18:26:14 -0400 Subject: [PATCH] secrets: reorg user-specific secrets --- homes/aly/secrets.nix | 10 +++--- hosts/fallarbor/secrets.nix | 4 +-- hosts/lavaridge/secrets.nix | 4 +-- hosts/mauville/secrets.nix | 4 +-- hosts/petalburg/secrets.nix | 4 +-- hosts/rustboro/secrets.nix | 4 +-- secrets/{ => aly}/backblaze/key.age | 0 secrets/{ => aly}/backblaze/keyId.age | 0 secrets/{ => aly}/mail/achacega_gmail.age | Bin .../{ => aly}/mail/alyraffauf_fastmail.age | Bin .../{ => aly}/syncthing/fallarbor/cert.age | Bin secrets/{ => aly}/syncthing/fallarbor/key.age | Bin .../{ => aly}/syncthing/lavaridge/cert.age | Bin secrets/{ => aly}/syncthing/lavaridge/key.age | Bin secrets/{ => aly}/syncthing/mauville/cert.age | Bin secrets/{ => aly}/syncthing/mauville/key.age | Bin .../{ => aly}/syncthing/petalburg/cert.age | Bin secrets/{ => aly}/syncthing/petalburg/key.age | 0 secrets/{ => aly}/syncthing/rustboro/cert.age | Bin secrets/{ => aly}/syncthing/rustboro/key.age | 0 secrets/{ => aly}/transmissionRemote.age | Bin secrets/secrets.nix | 30 +++++++++--------- 22 files changed, 30 insertions(+), 30 deletions(-) rename secrets/{ => aly}/backblaze/key.age (100%) rename secrets/{ => aly}/backblaze/keyId.age (100%) rename secrets/{ => aly}/mail/achacega_gmail.age (100%) rename secrets/{ => aly}/mail/alyraffauf_fastmail.age (100%) rename secrets/{ => aly}/syncthing/fallarbor/cert.age (100%) rename secrets/{ => aly}/syncthing/fallarbor/key.age (100%) rename secrets/{ => aly}/syncthing/lavaridge/cert.age (100%) rename secrets/{ => aly}/syncthing/lavaridge/key.age (100%) rename secrets/{ => aly}/syncthing/mauville/cert.age (100%) rename secrets/{ => aly}/syncthing/mauville/key.age (100%) rename secrets/{ => aly}/syncthing/petalburg/cert.age (100%) rename secrets/{ => aly}/syncthing/petalburg/key.age (100%) rename secrets/{ => aly}/syncthing/rustboro/cert.age (100%) rename secrets/{ => aly}/syncthing/rustboro/key.age (100%) rename secrets/{ => aly}/transmissionRemote.age (100%) diff --git a/homes/aly/secrets.nix b/homes/aly/secrets.nix index 111e71ef..65a1ad65 100644 --- a/homes/aly/secrets.nix +++ b/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"; }; }; diff --git a/hosts/fallarbor/secrets.nix b/hosts/fallarbor/secrets.nix index 40854dcd..9aa8c748 100644 --- a/hosts/fallarbor/secrets.nix +++ b/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; }; } diff --git a/hosts/lavaridge/secrets.nix b/hosts/lavaridge/secrets.nix index bcf37926..8f3d2ea7 100644 --- a/hosts/lavaridge/secrets.nix +++ b/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; }; } diff --git a/hosts/mauville/secrets.nix b/hosts/mauville/secrets.nix index 9fa3a396..9c81b63b 100644 --- a/hosts/mauville/secrets.nix +++ b/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; }; } diff --git a/hosts/petalburg/secrets.nix b/hosts/petalburg/secrets.nix index 749f6183..cc7459e1 100644 --- a/hosts/petalburg/secrets.nix +++ b/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; }; } diff --git a/hosts/rustboro/secrets.nix b/hosts/rustboro/secrets.nix index 41c8519d..ab1111ce 100644 --- a/hosts/rustboro/secrets.nix +++ b/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; }; } diff --git a/secrets/backblaze/key.age b/secrets/aly/backblaze/key.age similarity index 100% rename from secrets/backblaze/key.age rename to secrets/aly/backblaze/key.age diff --git a/secrets/backblaze/keyId.age b/secrets/aly/backblaze/keyId.age similarity index 100% rename from secrets/backblaze/keyId.age rename to secrets/aly/backblaze/keyId.age diff --git a/secrets/mail/achacega_gmail.age b/secrets/aly/mail/achacega_gmail.age similarity index 100% rename from secrets/mail/achacega_gmail.age rename to secrets/aly/mail/achacega_gmail.age diff --git a/secrets/mail/alyraffauf_fastmail.age b/secrets/aly/mail/alyraffauf_fastmail.age similarity index 100% rename from secrets/mail/alyraffauf_fastmail.age rename to secrets/aly/mail/alyraffauf_fastmail.age diff --git a/secrets/syncthing/fallarbor/cert.age b/secrets/aly/syncthing/fallarbor/cert.age similarity index 100% rename from secrets/syncthing/fallarbor/cert.age rename to secrets/aly/syncthing/fallarbor/cert.age diff --git a/secrets/syncthing/fallarbor/key.age b/secrets/aly/syncthing/fallarbor/key.age similarity index 100% rename from secrets/syncthing/fallarbor/key.age rename to secrets/aly/syncthing/fallarbor/key.age diff --git a/secrets/syncthing/lavaridge/cert.age b/secrets/aly/syncthing/lavaridge/cert.age similarity index 100% rename from secrets/syncthing/lavaridge/cert.age rename to secrets/aly/syncthing/lavaridge/cert.age diff --git a/secrets/syncthing/lavaridge/key.age b/secrets/aly/syncthing/lavaridge/key.age similarity index 100% rename from secrets/syncthing/lavaridge/key.age rename to secrets/aly/syncthing/lavaridge/key.age diff --git a/secrets/syncthing/mauville/cert.age b/secrets/aly/syncthing/mauville/cert.age similarity index 100% rename from secrets/syncthing/mauville/cert.age rename to secrets/aly/syncthing/mauville/cert.age diff --git a/secrets/syncthing/mauville/key.age b/secrets/aly/syncthing/mauville/key.age similarity index 100% rename from secrets/syncthing/mauville/key.age rename to secrets/aly/syncthing/mauville/key.age diff --git a/secrets/syncthing/petalburg/cert.age b/secrets/aly/syncthing/petalburg/cert.age similarity index 100% rename from secrets/syncthing/petalburg/cert.age rename to secrets/aly/syncthing/petalburg/cert.age diff --git a/secrets/syncthing/petalburg/key.age b/secrets/aly/syncthing/petalburg/key.age similarity index 100% rename from secrets/syncthing/petalburg/key.age rename to secrets/aly/syncthing/petalburg/key.age diff --git a/secrets/syncthing/rustboro/cert.age b/secrets/aly/syncthing/rustboro/cert.age similarity index 100% rename from secrets/syncthing/rustboro/cert.age rename to secrets/aly/syncthing/rustboro/cert.age diff --git a/secrets/syncthing/rustboro/key.age b/secrets/aly/syncthing/rustboro/key.age similarity index 100% rename from secrets/syncthing/rustboro/key.age rename to secrets/aly/syncthing/rustboro/key.age diff --git a/secrets/transmissionRemote.age b/secrets/aly/transmissionRemote.age similarity index 100% rename from secrets/transmissionRemote.age rename to secrets/aly/transmissionRemote.age diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 3b15ad31..bf4c36e1 100644 --- a/secrets/secrets.nix +++ b/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; }