From ecbb8818bb7ae5be890ca799363b4f5f50f284b6 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 21 Nov 2022 03:44:40 +0100 Subject: [PATCH] leon, leoncloud: reuse sshKeys --- hosts/leon/default.nix | 5 ++--- hosts/leoncloud/default.nix | 6 ++---- users.nix | 3 ++- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 0678ba1c..84bc5582 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -64,9 +64,8 @@ isNormalUser = true; extraGroups = [ "wheel" "docker" ]; createHome = true; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANupx+diz5N8sGZOc7ZXopyPh9HaML8M7Qh70aVVIaJ leon@leons-Air" - ]; + openssh.authorizedKeys.keys = with import ../../users.nix; + leon.sshKeys; }; networking.firewall = { diff --git a/hosts/leoncloud/default.nix b/hosts/leoncloud/default.nix index 50d753fc..c4375c8a 100644 --- a/hosts/leoncloud/default.nix +++ b/hosts/leoncloud/default.nix @@ -48,10 +48,8 @@ isNormalUser = true; extraGroups = [ "wheel" "docker" ]; createHome = true; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJPZoT83l0ogbJpviBs4VmO+NdF4NPtYAnyf8RRSoXsv leon@leon" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANupx+diz5N8sGZOc7ZXopyPh9HaML8M7Qh70aVVIaJ leon@leons-Air" - ]; + openssh.authorizedKeys.keys = with import ../../users.nix; + leon.sshKeys; }; diff --git a/users.nix b/users.nix index 0c87007f..0fc46e4c 100644 --- a/users.nix +++ b/users.nix @@ -61,6 +61,7 @@ ]; leon.sshKeys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDcYiIES2gFpS4OXFpCkiVqV34+duNKOAySkSsO+1e8Nyegmb7mchmCy78uohsjgZD5lPwNUX9UsAY4Uw9vO9w5QV/2zAX5XNElKf8xm4UvtkEiKU5zquxn3iAi1UBrT2+AgRZEOzkPpc5yeh76b9thYZULUao6CXAR2TTD2CaYFIOrZ2psDtAAdNdq8Sqkpg5BaVFnTITHIc+ihr2QpONFsWGHA4J2jgLnKATQIXMfCJuAJb2oAA6FkyMbDqcCkt6Y0FDhHX9Vj8ANzoSwKmptG3S6EEryz/XfYkkqNG37FgKXpCg4pMm84X6T0oWIJ3xLWH7UFAMkxeHE34GYnnU0fw0hmcY0DHYZsG9n+2cKpr0XXA6sXYdp5VwGBJItbAZF3m2qK1xyLtBk02sPzlaS/88knMa784ISPXPJ2fQqoO5cX3fkPJkrK4csEf08ERFa/wouUl+fSDSfK8Ug1qAsY//JpfMSaSZsa6vGS83thpqfWJbxN/dD7Er/lYFA/tE= leon@MacBook-Air" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJPZoT83l0ogbJpviBs4VmO+NdF4NPtYAnyf8RRSoXsv leon@leon" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANupx+diz5N8sGZOc7ZXopyPh9HaML8M7Qh70aVVIaJ leon@leons-Air" ]; }