diff --git a/nix/configurations/tungsten/nixos/connectivity.nix b/nix/configurations/tungsten/nixos/connectivity.nix index bcffb884..b48e0ac3 100644 --- a/nix/configurations/tungsten/nixos/connectivity.nix +++ b/nix/configurations/tungsten/nixos/connectivity.nix @@ -11,10 +11,10 @@ services.usbmuxd.enable = true; environment.systemPackages = [pkgs.libimobiledevice]; - users.users.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGPq2o9pbmLRGrOpAP76eYCAscmfakDC7wPm9fmsCCQM leana@vanadium" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF52lTIu9kT4gb6RnAefriQkeTKs/hKG6kI/M8zTDWyo root@vanadium" - ]; + users.users.root.openssh.authorizedKeys.keys = let + ids = import ../../../identities.nix; + in + builtins.concatMap builtins.attrValues (builtins.attrValues ids); networking = { networkmanager.enable = lib.mkForce false; diff --git a/nix/configurations/vanadium/nixos/connectivity.nix b/nix/configurations/vanadium/nixos/connectivity.nix index 037607fe..c5967f21 100644 --- a/nix/configurations/vanadium/nixos/connectivity.nix +++ b/nix/configurations/vanadium/nixos/connectivity.nix @@ -11,10 +11,10 @@ services.usbmuxd.enable = true; environment.systemPackages = [pkgs.libimobiledevice]; - users.users.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGPq2o9pbmLRGrOpAP76eYCAscmfakDC7wPm9fmsCCQM leana@vanadium" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF52lTIu9kT4gb6RnAefriQkeTKs/hKG6kI/M8zTDWyo root@vanadium" - ]; + users.users.root.openssh.authorizedKeys.keys = let + ids = import ../../../identities.nix; + in + builtins.concatMap builtins.attrValues (builtins.attrValues ids); networking = { networkmanager.enable = lib.mkForce false; diff --git a/nix/identities.nix b/nix/identities.nix new file mode 100644 index 00000000..f7b8fbb4 --- /dev/null +++ b/nix/identities.nix @@ -0,0 +1,11 @@ +{ + vanadium = { + leana = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGPq2o9pbmLRGrOpAP76eYCAscmfakDC7wPm9fmsCCQM leana@vanadium"; + root = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDc55vENX+13c4s2w7zjTb8T/AnBnTi96yRC5+fy7Z2A root@vanadium"; + }; + + tungsten = { + leana = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDKTWVdXIZZuxw1FbBBaskExFmYfUWR1MboP/GnC1eCo leana@tungsten"; + root = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBkeH6KvULmx4XxgdbUoL8ZC0rAGTAOlYRWQRP0pKrzx root@tungsten"; + }; +} diff --git a/nix/secrets/secrets.nix b/nix/secrets/secrets.nix index 8a934755..fc0cb45f 100644 --- a/nix/secrets/secrets.nix +++ b/nix/secrets/secrets.nix @@ -1,17 +1,10 @@ let - vanadium = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGPq2o9pbmLRGrOpAP76eYCAscmfakDC7wPm9fmsCCQM leana@vanadium" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDc55vENX+13c4s2w7zjTb8T/AnBnTi96yRC5+fy7Z2A root@vanadium" - ]; - - tungsten = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDKTWVdXIZZuxw1FbBBaskExFmYfUWR1MboP/GnC1eCo leana@tungsten" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBkeH6KvULmx4XxgdbUoL8ZC0rAGTAOlYRWQRP0pKrzx root@tungsten" - ]; + ids = import ../identities.nix; + inherit (ids) vanadium tungsten; all = - vanadium - ++ tungsten; + builtins.attrValues vanadium + ++ builtins.attrValues tungsten; in { "wpa_password.age".publicKeys = all;