From e3ff9c7a88652d4219c9494a70ac48afd2b45010 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Tue, 27 Dec 2022 15:23:16 -0500 Subject: [PATCH] users/config.nix --- flake.nix | 1 - secrets/secrets.nix | 2 +- users/config.nix | 21 +++++++++++++++++++++ users/default.nix | 5 +---- users/info.nix | 18 ------------------ 5 files changed, 23 insertions(+), 24 deletions(-) create mode 100644 users/config.nix delete mode 100644 users/info.nix diff --git a/flake.nix b/flake.nix index 77d592b..81c8cc1 100644 --- a/flake.nix +++ b/flake.nix @@ -48,7 +48,6 @@ ./nix-darwin ]; - flake = { # Configurations for Linux (NixOS) systems nixosConfigurations = { diff --git a/secrets/secrets.nix b/secrets/secrets.nix index ec350bc..75b9b29 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,6 +1,6 @@ let keys = - (import ../users/info.nix).srid.sshKeys + (import ../users/config.nix).users.ssrid.sshKeys ++ [ (import ../systems/hetzner/ax41.info.nix).hostKeyPub ]; diff --git a/users/config.nix b/users/config.nix new file mode 100644 index 0000000..80170b7 --- /dev/null +++ b/users/config.nix @@ -0,0 +1,21 @@ +{ + myself = "srid"; + users = { + srid = { + name = "Sridhar Ratnakumar"; + email = "srid@srid.ca"; + sshKeys = [ + # Legacy + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCYQ003p7fB5ICQehLwhDBomY9WzkNBeijkSw9ADGU+ECrPakeIH3pntUWRJH1W93vKnLqpkn6HLGEXD9MCR0s98uhh8hT7uAYCxQTbEeKT3PYkfz3oe7XaR8rE601sds0ZyFwH7l8cvK97pGr+uhFXAaohiV6VqmLVXhManEjZZ8GfYWBD9BCmIJk43G3OGa5QYFeHqztprXaJNU5dFPv2Uq2C+L6EvfCfkK2OO1BLZgL+Rai5jjyy6k0fcfsxxd9BdGUwqDhcBeyTIzX9rePMugf/xD+6uNRxTU+vjVpGUtFOw6rpgmVyFv9mn3QMNdQBc5hYKVbIQwMNGTzGgcQv srid@nixos" + # New + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHQRxPoqlThDrkR58pKnJgmeWPY9/wleReRbZ2MOZRyd" + # pinch + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHcp8sjrazhs+o0Ps/g36CUxIKk3DvMXRP9upHN6IxBq" + ]; + }; + uday = { + name = "Uday Kiran"; + email = "udaycruise2903@gmail.com"; + }; + }; +} diff --git a/users/default.nix b/users/default.nix index 2615758..3fd0055 100644 --- a/users/default.nix +++ b/users/default.nix @@ -39,9 +39,6 @@ in }; }; config = { - people = { - myself = "srid"; - users = import ./info.nix; - }; + people = import ./config.nix; }; } diff --git a/users/info.nix b/users/info.nix deleted file mode 100644 index 9ee5cf0..0000000 --- a/users/info.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - srid = { - name = "Sridhar Ratnakumar"; - email = "srid@srid.ca"; - sshKeys = [ - # Legacy - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCYQ003p7fB5ICQehLwhDBomY9WzkNBeijkSw9ADGU+ECrPakeIH3pntUWRJH1W93vKnLqpkn6HLGEXD9MCR0s98uhh8hT7uAYCxQTbEeKT3PYkfz3oe7XaR8rE601sds0ZyFwH7l8cvK97pGr+uhFXAaohiV6VqmLVXhManEjZZ8GfYWBD9BCmIJk43G3OGa5QYFeHqztprXaJNU5dFPv2Uq2C+L6EvfCfkK2OO1BLZgL+Rai5jjyy6k0fcfsxxd9BdGUwqDhcBeyTIzX9rePMugf/xD+6uNRxTU+vjVpGUtFOw6rpgmVyFv9mn3QMNdQBc5hYKVbIQwMNGTzGgcQv srid@nixos" - # New - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHQRxPoqlThDrkR58pKnJgmeWPY9/wleReRbZ2MOZRyd" - # pinch - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHcp8sjrazhs+o0Ps/g36CUxIKk3DvMXRP9upHN6IxBq" - ]; - }; - uday = { - name = "Uday Kiran"; - email = "udaycruise2903@gmail.com"; - }; -}