overhaul secrets organization

1 files changed, 16 insertions, 12 deletions

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 815b217..cc1da46 100755
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -1,16 +1,20 @@
 let
-  culsans = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMcc7hXixElOgv87LlY1LgCQ9oOT6Lj66wjCh1uRqpQt culsans@nzxt-desktop"; # culsans@nzxt-desktop
-  lucas = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICn8CAOpucqQvDkkEOGYYuSf8+mfrA4qkUK5u8v+WLEz lucas@ideapad-laptop"; # lucas@ideapad-laptop
-  server = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGDHcZoKu7q28H3hf4TzkONZxt+dky/HbMEHuC2uKr5P server@prodesk-server"; # server@ideapad-server
+  nzxt-desktop = {
+    system = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKtnKVcdZNk3zp/XptQDtBDJig7sMEe5RLRhAO3Sx3sl root@nzxt-desktop";
+    culsans = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMcc7hXixElOgv87LlY1LgCQ9oOT6Lj66wjCh1uRqpQt culsans@nzxt-desktop";
+  };
 
-  nzxt-desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKtnKVcdZNk3zp/XptQDtBDJig7sMEe5RLRhAO3Sx3sl root@nzxt-desktop";
-  ideapad-laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP5hHZpHf/0xj4UK5091fBB9tDonfd6FDGkPr+HWlZBc root@ideapad-laptop";
-  prodesk-server = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOj6+nSYDABUsNqrSuc/IIhrShez0n5vPKAUTZMoINFl root@prodesk-server";
-in {
-  "culsans-user-password.age".publicKeys = [ nzxt-desktop culsans ];
-  "lucas-user-password.age".publicKeys = [ ideapad-laptop lucas ];
-  "server-user-password.age".publicKeys = [ prodesk-server server ];
+  prodesk-server = {
+    system = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOj6+nSYDABUsNqrSuc/IIhrShez0n5vPKAUTZMoINFl root@prodesk-server";
+    server = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGDHcZoKu7q28H3hf4TzkONZxt+dky/HbMEHuC2uKr5P server@prodesk-server";
+  };
 
-  # Namecheap DDNS Password
-  "namecheap-ddns-password.age".publicKeys = [ culsans lucas server prodesk-server ];
+  thinkpad-laptop = {
+    system = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINgCZw2RzdgXnW0lpgJQ2hBb+0V1fZoemJQtqDQbhFZk root@thinkpad-laptop";
+    lucas = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM/HLlWDshs3Fn4pbTrUeSdo/2/YWuBEMpQX15ZR0RNv lucas@thinkpad-laptop";
+  };
+in {
+  "user-passwords/nzxt-desktop/culsans.age".publicKeys = [ nzxt-desktop.system nzxt-desktop.culsans ];
+  "user-passwords/thinkpad-laptop/lucas.age".publicKeys = [ thinkpad-laptop.system thinkpad-laptop.lucas ];
+  "user-passwords/prodesk-server/server.age".publicKeys = [ prodesk-server.system prodesk-server.server ];
 }