From 120981440c01e71c2f07eff2550e890435381437 Mon Sep 17 00:00:00 2001
From: triethyl <triethylammonium@pm.me>
Date: Thu, 14 Aug 2025 21:48:57 -0400
Subject: overhaul secrets organization

---
 secrets/culsans-user-password.age                |   7 ------
 secrets/lucas-user-password.age                  | Bin 338 -> 0 bytes
 secrets/secrets.nix                              |  28 +++++++++++++----------
 secrets/user-passwords/ideapad-laptop/lucas.age  | Bin 0 -> 338 bytes
 secrets/user-passwords/nzxt-desktop/culsans.age  |   7 ++++++
 secrets/user-passwords/thinkpad-laptop/lucas.age |   7 ++++++
 6 files changed, 30 insertions(+), 19 deletions(-)
 delete mode 100644 secrets/culsans-user-password.age
 delete mode 100644 secrets/lucas-user-password.age
 create mode 100644 secrets/user-passwords/ideapad-laptop/lucas.age
 create mode 100644 secrets/user-passwords/nzxt-desktop/culsans.age
 create mode 100644 secrets/user-passwords/thinkpad-laptop/lucas.age

(limited to 'secrets')

diff --git a/secrets/culsans-user-password.age b/secrets/culsans-user-password.age
deleted file mode 100644
index a92fff7..0000000
--- a/secrets/culsans-user-password.age
+++ /dev/null
@@ -1,7 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 WRTnYA qBxysw6Blm5w0eS3pdYWHVKhLUBM9fjqHGdiS2728kA
-wOFVVf1Z4vtMeY7VWPGDK2fE401S06lUIPkOJ6eW0Lg
--> ssh-ed25519 /proDQ lu5yVBvnJmkgEcOHcf3c+YAYYOngpMend80Gaq+I7hs
-SusZnNXGR9Zx40sm4+L/pNrqgkUS8F/17Wl6PR8nuDo
---- DB2RJ7g73LYU1NlLGZk8M3bRUJMBNeCmiwfMLYit+gg
-|)��r]O]PY��퍆޴n��5?K_�rR����f�gl�{�H�r
\ No newline at end of file
diff --git a/secrets/lucas-user-password.age b/secrets/lucas-user-password.age
deleted file mode 100644
index 0fb32bd..0000000
Binary files a/secrets/lucas-user-password.age and /dev/null differ
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 ];
 }
diff --git a/secrets/user-passwords/ideapad-laptop/lucas.age b/secrets/user-passwords/ideapad-laptop/lucas.age
new file mode 100644
index 0000000..0fb32bd
Binary files /dev/null and b/secrets/user-passwords/ideapad-laptop/lucas.age differ
diff --git a/secrets/user-passwords/nzxt-desktop/culsans.age b/secrets/user-passwords/nzxt-desktop/culsans.age
new file mode 100644
index 0000000..a92fff7
--- /dev/null
+++ b/secrets/user-passwords/nzxt-desktop/culsans.age
@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 WRTnYA qBxysw6Blm5w0eS3pdYWHVKhLUBM9fjqHGdiS2728kA
+wOFVVf1Z4vtMeY7VWPGDK2fE401S06lUIPkOJ6eW0Lg
+-> ssh-ed25519 /proDQ lu5yVBvnJmkgEcOHcf3c+YAYYOngpMend80Gaq+I7hs
+SusZnNXGR9Zx40sm4+L/pNrqgkUS8F/17Wl6PR8nuDo
+--- DB2RJ7g73LYU1NlLGZk8M3bRUJMBNeCmiwfMLYit+gg
+|)��r]O]PY��퍆޴n��5?K_�rR����f�gl�{�H�r
\ No newline at end of file
diff --git a/secrets/user-passwords/thinkpad-laptop/lucas.age b/secrets/user-passwords/thinkpad-laptop/lucas.age
new file mode 100644
index 0000000..2b9bdc8
--- /dev/null
+++ b/secrets/user-passwords/thinkpad-laptop/lucas.age
@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 Wfy90Q pTGfyan/aglag5BZ96jJahoLU2xLkoKMIFx7PL4F/Fk
+XzNdJzzsyZd2WrnbDA9EBc0DX+o0RKWC4Ashp3WYN8M
+-> ssh-ed25519 um9c2w fAH7MrsEH4E23WAaUDj/DyKfozjgq6B79YZ+JuV+w0M
+MQht0n8g1d6e7x/MpKNLD2PdI0OhORvlZAuc0KYiTF0
+--- ztxqjvWmp0WB1P3pKeZkRwIEBFCjW1+CReb5p9Fyxok
+
�˘�b��>�	֑U��阮e�^�;@Ψ]|n1�Y�5���O:J�Ӝ:
\ No newline at end of file
-- 
cgit v1.2.3