diff --git a/config.nix b/config.nix index 32f7c60..310bdc7 100644 --- a/config.nix +++ b/config.nix @@ -8,10 +8,10 @@ let email = lib.mkOption { type = lib.types.str; }; - sshKeyPub = lib.mkOption { - type = lib.types.str; + sshKeys = lib.mkOption { + type = lib.types.listOf lib.types.str; description = '' - SSH public key + SSH public keys ''; }; }; diff --git a/nixos/ssh-authorize.nix b/nixos/ssh-authorize.nix index 6ee3c83..bd91655 100644 --- a/nixos/ssh-authorize.nix +++ b/nixos/ssh-authorize.nix @@ -5,14 +5,10 @@ users.users = let people = flake.config.people; - myPubKey = people.users.${people.myself}.sshKeyPub; + myKeys = people.users.${people.myself}.sshKeys; in { - root.openssh.authorizedKeys.keys = [ - myPubKey - ]; - ${people.myself}.openssh.authorizedKeys.keys = [ - myPubKey - ]; + root.openssh.authorizedKeys.keys = myKeys; + ${people.myself}.openssh.authorizedKeys.keys = myKeys; }; } diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 19a7415..7c3362b 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,8 +1,9 @@ let - keys = [ - (import ../users.nix).srid.sshKeyPub - (import ../systems/hetzner/ax41.info.nix).hostKeyPub - ]; + keys = + (import ../users.nix).srid.sshKeys + ++ [ + (import ../systems/hetzner/ax41.info.nix).hostKeyPub + ]; in { "cache-priv-key.age".publicKeys = keys; diff --git a/users.nix b/users.nix index 61900b4..50ed83f 100644 --- a/users.nix +++ b/users.nix @@ -2,7 +2,12 @@ srid = { name = "Sridhar Ratnakumar"; email = "srid@srid.ca"; - sshKeyPub = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCYQ003p7fB5ICQehLwhDBomY9WzkNBeijkSw9ADGU+ECrPakeIH3pntUWRJH1W93vKnLqpkn6HLGEXD9MCR0s98uhh8hT7uAYCxQTbEeKT3PYkfz3oe7XaR8rE601sds0ZyFwH7l8cvK97pGr+uhFXAaohiV6VqmLVXhManEjZZ8GfYWBD9BCmIJk43G3OGa5QYFeHqztprXaJNU5dFPv2Uq2C+L6EvfCfkK2OO1BLZgL+Rai5jjyy6k0fcfsxxd9BdGUwqDhcBeyTIzX9rePMugf/xD+6uNRxTU+vjVpGUtFOw6rpgmVyFv9mn3QMNdQBc5hYKVbIQwMNGTzGgcQv srid@nixos"; + sshKeys = [ + # Legacy + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCYQ003p7fB5ICQehLwhDBomY9WzkNBeijkSw9ADGU+ECrPakeIH3pntUWRJH1W93vKnLqpkn6HLGEXD9MCR0s98uhh8hT7uAYCxQTbEeKT3PYkfz3oe7XaR8rE601sds0ZyFwH7l8cvK97pGr+uhFXAaohiV6VqmLVXhManEjZZ8GfYWBD9BCmIJk43G3OGa5QYFeHqztprXaJNU5dFPv2Uq2C+L6EvfCfkK2OO1BLZgL+Rai5jjyy6k0fcfsxxd9BdGUwqDhcBeyTIzX9rePMugf/xD+6uNRxTU+vjVpGUtFOw6rpgmVyFv9mn3QMNdQBc5hYKVbIQwMNGTzGgcQv srid@nixos" + # New + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHQRxPoqlThDrkR58pKnJgmeWPY9/wleReRbZ2MOZRyd" + ]; }; uday = { name = "Uday Kiran";