Draft, import ssh key from ssh.nix

Signed-off-by: Samuli Leivo <samuli.leivo@unikie.com>
tiiuae · Apr 16, 2024 · 97c5ce6 · 97c5ce6
1 parent 4609c2d
commit 97c5ce6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/modules/common/development/ssh.nix b/modules/common/development/ssh.nix
@@ -21,6 +21,9 @@
     "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIEJ9ewKwo5FLj6zE30KnTn8+nw7aKdei9SeTwaAeRdJDAAAABHNzaDo= brian@minerva"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDdNDuKwAsAff4iFRfujo77W4cyAbfQHjHP57h/7tJde ville.ilvonen@unikie.com"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICKm9NtS/ZmrxQhY/pbRlX+9O1VaBEd8D9vojDtvS0Ru juliuskoskela@vega"
+
+    # For ghaf-installer automated testing:
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAolaKCuIUBQSBFGFZI1taNX+JTAr8edqUts7A6k2Kv7"
   ];
 in
   with lib; {

diff --git a/targets/lenovo-x1-installer/flake-module.nix b/targets/lenovo-x1-installer/flake-module.nix
@@ -31,9 +31,7 @@
           ghaf.hardware.ax88179_178a.enable = true;
 
           # SSH key to installer for test automation.
-          users.users.nixos.openssh.authorizedKeys.keys = lib.mkIf (variant == "debug") [
-            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAolaKCuIUBQSBFGFZI1taNX+JTAr8edqUts7A6k2Kv7"
-          ];
+          users.users.nixos.openssh.authorizedKeys.keys = lib.mkIf (variant == "debug") (import ../../modules/common/development/ssh.nix).authorizedKeys;
 
           systemd.services.wpa_supplicant.wantedBy = lib.mkForce ["multi-user.target"];
           systemd.services.sshd.wantedBy = lib.mkForce ["multi-user.target"];