From ef3cea71ee32e8448d57c623439875a4554a3e63 Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Sun, 31 Jul 2022 20:33:19 +0200
Subject: [PATCH] sail: Add user

---
 home/hosts/Styx.nix        |   2 +-
 secret/hosts/sail.nix      | Bin 223 -> 396 bytes
 system/hosts/sail.nix      |  18 +++++++++++++++---
 system/shared/ssh-keys.nix |   3 +++
 4 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 system/shared/ssh-keys.nix

diff --git a/home/hosts/Styx.nix b/home/hosts/Styx.nix
index 461b350..dce668b 100644
--- a/home/hosts/Styx.nix
+++ b/home/hosts/Styx.nix
@@ -30,7 +30,7 @@
   ];
 
   home = {
-    stateVersion = "22.05";
+    stateVersion = "22.11";
 
     packages = with pkgs; [
       agilebits-op
diff --git a/secret/hosts/sail.nix b/secret/hosts/sail.nix
index 52204fee2237c75b26944de66e8c4f1de0c88807..a61b649c7288db502aac83156f387109637b2ea9 100644
GIT binary patch
literal 396
zcmV;70dxKUM@dveQdv+`01DUr&Kh3c@B%Bd*4gO>i-xq>1a!)ba=gSRjKPnNrm5mw
zPD{1ENf=+DC8dmT){uGcV;_sygM`_UUO8F{Cur^fUe-Clvm*g^qy+u5&QF=EtJn8-
zL7W1wmUZ+>94}?#2wUZd5T@)GJGf#sGSc24w%At0c}Zuv4My%r*uVAeQX_0zSzEPc
zjjyv7sj#~QKc`SzlAIfu;AeK&3hQNBBm*c$CEeyeqbT8U9%3r^#n-Rk`?lTM7zH6+
zC&$0A`~&LfVOznzb&Z=Tb_W&#T6YX{|NX!mak2Bj2!}>w1!qoZk4Z205L~D2g3wyv
zYOs(?IrG{rVP{?)zOwJT8qfcBb%c7=B8i^cm7AjhsK<eh1z23P0=qEt?-ewkD3B_t
ziQ)r|2pT_Eu@QDMk(;KbwFLgi0X~b0@^foM;Ub)s%{(`FB(KEpXN|&8b(yp1S!~Ec
qmWmKuMFG}fa)mg1?vK%hHO|aejuT$xLl*!2i}t8*@^v}#P(i&G48*7a

literal 223
zcmV<503iPWM@dveQdv+`0C>C}_3KlQsuR6=2Fq*dpXfif%mi#d{k`ZYOdK(Otm==v
z5K|-6hdl(j<@ytf`ghwT(3^qgL8%;-jlBT#Y!CiAlav}JEvzE&PMuCquPb~+>!U&K
zeqCTi0d)8;HT$-uUJp^QFjKB9OD3PE@%CMiSq5z5ywUHEV}L~gMgb1*q`UHDwreK4
zZNgPDYuK7{l1GJC`$F*d)r2k_0Xb#u*ZR+dt+m7u%9|2!%?j66Sm)AS>$b%a*_IF%
Z!Mru_^XZKAJqZu5xJ}$)p+I-#J_0agZx{do

diff --git a/system/hosts/sail.nix b/system/hosts/sail.nix
index 6b80a20..5ce2848 100644
--- a/system/hosts/sail.nix
+++ b/system/hosts/sail.nix
@@ -2,6 +2,7 @@ args@{ pkgs, ... }:
 
 let
   secret = import ../../secret/hosts/sail.nix;
+  ssh-keys = import ../shared/ssh-keys.nix;
 in
 {
   imports = [
@@ -54,7 +55,18 @@ in
     ];
   };
 
-  users.users.root.openssh.authorizedKeys.keys = [
-    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDTRKrX0wVWoauI+dSfFpKIr7qwh8imrp1OVlxWyCuFssZI2o6chmRBZq4EbOkVvfdgdOGJ4hTSwQOTwusZVrZHwxtinusX5c2M3HMrhMvLFAYh2vKrvP5UZBTA/7laenSM6uLGxrM2CNc+G8ryAyY7dLoU2xaXiqgcfC6MaU/leTMTXWH5fHvqUk2pxI4ihObTGiDE5kvvFbv3AhFFtcMmkzdHN1vlVp8olKG0lYOLM9O3PpVGJtiOTA2Z9YuTC44iH984HPmk3KkJsK/PZFI1d4K7oW7298w44pszElGwjIW0GyB7X4qo6yOxsq1OsL/c7T9VHWVw3na2QvAJODBNM8rYGMACo8oSEThRsi1hhXPe7MhLPqwhn3OHbbofupbqk7WpKVaMLrO7793DgNatPNhGgbz9WtVCC65YPY3De3sowsh4M4u0HC5lRg0IgjBMgUjMAHWqcxytYRUKPRrdKbcaoOoMquMnja+bcLfHxVOkcLMgEfzPtjxgZCvenUsy0Q73dwxAtJx73xscMZUWb/LbkLWoOzAh3jjyjIeZeT8ZyIOhfcgoxLFE4Ik7eIiszEg0xQ7jXzR+K3RL+2O93RvNTvc5WaDVypiL6Zics30EZAYMYtBoY69a1PxeJ42sLp3O35QNFbwfN4cnsx9YXgvUmTcwCijU/LbvNAgl2Q=="
-  ];
+  users.users = {
+    root = {
+      openssh.authorizedKeys.keys = [ ssh-keys.Hetzner ];
+    };
+
+    daniel = {
+      hashedPassword = secret.users.daniel.hashedPassword;
+      isNormalUser = true;
+      home = "/home/daniel";
+      description = "Daniel";
+      extraGroups = [ "wheel" ];
+      openssh.authorizedKeys.keys = [ ssh-keys.Hetzner ];
+    };
+  };
 }
diff --git a/system/shared/ssh-keys.nix b/system/shared/ssh-keys.nix
new file mode 100644
index 0000000..95c0a58
--- /dev/null
+++ b/system/shared/ssh-keys.nix
@@ -0,0 +1,3 @@
+{
+  Hetzner = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDTRKrX0wVWoauI+dSfFpKIr7qwh8imrp1OVlxWyCuFssZI2o6chmRBZq4EbOkVvfdgdOGJ4hTSwQOTwusZVrZHwxtinusX5c2M3HMrhMvLFAYh2vKrvP5UZBTA/7laenSM6uLGxrM2CNc+G8ryAyY7dLoU2xaXiqgcfC6MaU/leTMTXWH5fHvqUk2pxI4ihObTGiDE5kvvFbv3AhFFtcMmkzdHN1vlVp8olKG0lYOLM9O3PpVGJtiOTA2Z9YuTC44iH984HPmk3KkJsK/PZFI1d4K7oW7298w44pszElGwjIW0GyB7X4qo6yOxsq1OsL/c7T9VHWVw3na2QvAJODBNM8rYGMACo8oSEThRsi1hhXPe7MhLPqwhn3OHbbofupbqk7WpKVaMLrO7793DgNatPNhGgbz9WtVCC65YPY3De3sowsh4M4u0HC5lRg0IgjBMgUjMAHWqcxytYRUKPRrdKbcaoOoMquMnja+bcLfHxVOkcLMgEfzPtjxgZCvenUsy0Q73dwxAtJx73xscMZUWb/LbkLWoOzAh3jjyjIeZeT8ZyIOhfcgoxLFE4Ik7eIiszEg0xQ7jXzR+K3RL+2O93RvNTvc5WaDVypiL6Zics30EZAYMYtBoY69a1PxeJ42sLp3O35QNFbwfN4cnsx9YXgvUmTcwCijU/LbvNAgl2Q==";
+}