3 files changed, 18 insertions, 3 deletions

diff --git a/users/gkleen/authorized-keys/gkleen-sif.pub b/users/gkleen/authorized-keys/gkleen-sif.pub
new file mode 100644
index 00000000..e9aaf215
--- /dev/null
+++ b/users/gkleen/authorized-keys/gkleen-sif.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrHPERae+OUTNOzNf9d2767ljFCm5hgmQw48Dj4RrlU gkleen@sif.midgard.yggdrasil
diff --git a/users/gkleen/default.nix b/users/gkleen/default.nix
index 03e4a64b..f74701a5 100644
--- a/users/gkleen/default.nix
+++ b/users/gkleen/default.nix
@@ -1,7 +1,15 @@
-{ userName, pkgs, ... }:
+{ userName, pkgs, customUtils, lib, ... }:
 {
   users.users.${userName} = {
+    description = "Gregor Kleen";
+    extraGroups = [ "wheel" "networkmanager" "lp" "dialout" "audio" "video" "xmpp" "mail" "ssh" "vboxusers" "libvirtd" "wireshark" "games"];
+    group = "users";
+    uid = 1000;
+    createHome = true;
+    home = "/home/${userName}";
+    shell = "${pkgs.zsh}/bin/zsh";
+    isNormalUser = true;
+    openssh.authorizedKeys.keyFiles = lib.attrValues (customUtils.recImport rec { dir = ./authorized-keys; _import = name: _base: dir + "/${name}"; });
     hashedPassword = "$6$rounds=500000$dOMgCU7DAk$yQFYGOURTEt12387LIYBnFKSWmtwXMUk1LJWnV0m7OFt.y2TnxQn2abdGA5dhwG9EmMB5wZGXf4J5F71c746C/";
-    extraGroups = ["wheel" "networkmanager"];
   };
 }
diff --git a/users/root.nix b/users/root.nix
index 88cc6b26..95fe37c4 100644
--- a/users/root.nix
+++ b/users/root.nix
@@ -1 +1,7 @@
-import ./gkleen
+{ flake, lib, config, hostName, ... }:
+{
+  users.users.root = lib.mkIf (flake.nixosModules.accounts ? "gkleen@${hostName}") {
+    inherit (config.users.users."gkleen") hashedPassword shell;
+    openssh.authorizedKeys.keyFiles = config.users.users."gkleen".openssh.authorizedKeys.keyFiles;
+  };
+}