From 62a710c542b0733e6f5193441aff719b68b91b0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Sun, 2 Nov 2025 16:47:48 +0800
Subject: [PATCH] tree-wide!: flatten identities structure

It was never used with the names in mind
---
 .../hydrogen/nixos/connectivity.nix             |  5 +----
 .../vanadium/nixos/connectivity.nix             |  5 +----
 nix/identities.nix                              | 17 +++++++----------
 nix/secrets/secrets.nix                         |  5 +----
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/nix/configurations/hydrogen/nixos/connectivity.nix b/nix/configurations/hydrogen/nixos/connectivity.nix
index 6366ad80..767374c3 100644
--- a/nix/configurations/hydrogen/nixos/connectivity.nix
+++ b/nix/configurations/hydrogen/nixos/connectivity.nix
@@ -3,10 +3,7 @@
   lib,
   ...
 }: {
-  users.users.root.openssh.authorizedKeys.keys = let
-    ids = import ../../../identities.nix;
-  in
-    builtins.concatMap builtins.attrValues (builtins.attrValues ids);
+  users.users.root.openssh.authorizedKeys.keys = import ../../../identities.nix;
 
   networking = {
     networkmanager.enable = lib.mkForce false;
diff --git a/nix/configurations/vanadium/nixos/connectivity.nix b/nix/configurations/vanadium/nixos/connectivity.nix
index 6beafb00..46e53b78 100644
--- a/nix/configurations/vanadium/nixos/connectivity.nix
+++ b/nix/configurations/vanadium/nixos/connectivity.nix
@@ -15,10 +15,7 @@
     SUBSYSTEM=="usb", ACTION=="add", DRIVER=="apple-mfi-fastcharge", RUN+="/bin/sh -c 'echo Fast > /sys/class/power_supply/apple_mfi_fastcharge/charge_type'"
   '';
 
-  users.users.root.openssh.authorizedKeys.keys = let
-    ids = import ../../../identities.nix;
-  in
-    builtins.concatMap builtins.attrValues (builtins.attrValues ids);
+  users.users.root.openssh.authorizedKeys.keys = import ../../../identities.nix;
 
   networking = {
     networkmanager.enable = lib.mkForce false;
diff --git a/nix/identities.nix b/nix/identities.nix
index 9e94fd65..8d491a18 100644
--- a/nix/identities.nix
+++ b/nix/identities.nix
@@ -1,10 +1,7 @@
-{
-  vanadium = {
-    leana = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGPq2o9pbmLRGrOpAP76eYCAscmfakDC7wPm9fmsCCQM leana@vanadium";
-    root = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDc55vENX+13c4s2w7zjTb8T/AnBnTi96yRC5+fy7Z2A root@vanadium";
-  };
-  hydrogen = {
-    leana = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEXzNdCA0zZ+WmeKZnhQSQtUcxnQhhDl59E3BPQfLj7Q leana@hydrogen";
-    root = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIMVDmEt/12u9U4QGDZBx/Sx8itzqfQ4zWJvcC3pRZqP root@hydrogen";
-  };
-}
+[
+  "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGPq2o9pbmLRGrOpAP76eYCAscmfakDC7wPm9fmsCCQM leana@vanadium"
+  "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDc55vENX+13c4s2w7zjTb8T/AnBnTi96yRC5+fy7Z2A root@vanadium"
+
+  "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEXzNdCA0zZ+WmeKZnhQSQtUcxnQhhDl59E3BPQfLj7Q leana@hydrogen"
+  "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIMVDmEt/12u9U4QGDZBx/Sx8itzqfQ4zWJvcC3pRZqP root@hydrogen"
+]
diff --git a/nix/secrets/secrets.nix b/nix/secrets/secrets.nix
index a3b4ab52..311e3b60 100644
--- a/nix/secrets/secrets.nix
+++ b/nix/secrets/secrets.nix
@@ -1,8 +1,5 @@
 let
-  ids = import ../identities.nix;
-
-  all =
-    builtins.concatMap builtins.attrValues (builtins.attrValues ids);
+  all = import ../identities.nix;
 in {
   "wpa_password.age".publicKeys = all;