From 095e1028efd0632b7221f9266d50e6319961db7a Mon Sep 17 00:00:00 2001 From: William Carroll Date: Fri, 15 Apr 2022 10:36:50 -0700 Subject: feat(wpcarro/ssh): Give nathan access to ava Strange commit title, but true. Make sure nathan (my MBP) can SSH into ava (my NixOS box at work). Change-Id: Iaf79cdd1b8633a091c706c7cb84522e2023585c0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5455 Tested-by: BuildkiteCI Reviewed-by: wpcarro Autosubmit: wpcarro --- users/wpcarro/keys.nix | 5 ++--- users/wpcarro/nixos/ava/default.nix | 8 ++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/users/wpcarro/keys.nix b/users/wpcarro/keys.nix index 03cad5e0860a..a45c4e24df7a 100644 --- a/users/wpcarro/keys.nix +++ b/users/wpcarro/keys.nix @@ -4,8 +4,7 @@ rec { diogenes = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILFDRfpNXDxQuTJAqVg8+Mm/hOfE5VAJP+Lpw9kA5cDG wpcarro@gmail.com"; marcus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJkNQJBXekuSzZJ8+gxT+V1+eXTm3hYsfigllr/ARXkf wpcarro@gmail.com"; - seneca = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDSVqb0ehIxp33j8wJgPoCcd45NPnZ3CisDlcO1f5isTvOTSLVf5WAdqgDk9fuTTcOMdaiPQcun7psZYEZ7EnoiDYiNM/iYoqN5ga0MdQVCU0pvkJuExuK8MqdwAnjwrLx1bqw8ivXxbmrKMyN/fUsG8I7IzC+D61ycbMwxM5qSz2mgQjzHIhpS1HgCPJXchD3jo1kw9FgSVMAJJMGpWU6BcJsQ2cNTb3W8Kg3kdeahcIssysC6TbD2MFCI6ucPOdBvP/nMHQ/zwK3CgR75M57lyzqDPqu29OpiFacefN8Jxjgwlg4h/TP3tCkb+fSV/5vkBl8aagoPb+nepC5AWF9ADsagJ6y7HYRqkXnI6FaYRbHg+NjcEu1ljYQqAIl8lRLcVqFEHfqll1V12f1UeciNoSrOBXpb0pQrUs4YlaZU1rbq0t9dQob5x+mm5BrhNhKagEvx5nV+X5bxPywCLpdrotjKpW1oS+EssRq75cv9Aw2vqdNmk2pLhgKkOJu5RrOuitHL9Ts7ax6Co5S086BT57g3BCjaiCZDoWUSRTPc6K+rDPriCGXJqfGncdUJh20QsZPYIrWQSSJuRDW59WxnNbKvIH5aFvHM2S+HyjhZC+d5pjm9mhfHuluL9+Hwis7kxlqNoX3i/i5ufGEODaLeRu5xWp0hc5fYype8BL+NNw== wpcarro@gmail.com"; - svl = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILd/MvQ6aNbBn1OOmir2Le4A8/DCliisb38wDEXqCRfh wpcarro@gmail.com"; + nathan = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP2NjuP722VUgpSu5bVUPTfdVNPO8fSW0Jlas8L4up13 bill@nathan"; - all = [ diogenes marcus seneca svl ]; + all = [ diogenes marcus nathan ]; } diff --git a/users/wpcarro/nixos/ava/default.nix b/users/wpcarro/nixos/ava/default.nix index a3454af8c634..66ee029e39de 100644 --- a/users/wpcarro/nixos/ava/default.nix +++ b/users/wpcarro/nixos/ava/default.nix @@ -36,6 +36,8 @@ in }; services = wpcarro.common.services // { + openssh.enable = true; + xserver = { enable = true; layout = "us"; @@ -57,6 +59,9 @@ in hardware.pulseaudio.enable = true; users.mutableUsers = true; + users.users.root.openssh.authorizedKeys.keys = [ + wpcarro.keys.nathan + ]; users.users.wpcarro = { isNormalUser = true; extraGroups = [ @@ -65,6 +70,9 @@ in "docker" ]; shell = pkgs.fish; + openssh.authorizedKeys.keys = [ + wpcarro.keys.nathan + ]; }; security.sudo.wheelNeedsPassword = false; -- cgit 1.4.1