Fix missing user specification

2 files changed, 35 insertions, 1 deletions

diff --git a/hosts/common/users/don/default.nix b/hosts/common/users/don/default.nix
new file mode 100644
index 0000000..9b958c6
--- /dev/null
+++ b/hosts/common/users/don/default.nix
@@ -0,0 +1,32 @@
+{ pkgs, inputs, config, ... }:
+let
+  ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
+  uid = 1001;
+in
+{
+  users.groups.don.gid = uid;
+  users.users.don = {
+    description = "Don Arnold";
+    extraGroups = [
+      "audio"
+      "video"
+      "wheel"
+    ] ++ ifTheyExist [
+      "adbusers"
+      "networkmanager"
+      "vboxsf"
+      "vboxusers"
+    ];
+    group = "don";
+    home = "/home/don";
+    isNormalUser = true;
+    #openssh.authorizedKeys.keys = [
+    #  (builtins.readFile ./keys/id_arrakis.pub)
+    #  #(builtins.readFile ./keys/id_other.pub)
+    #];
+
+    packages = [ pkgs.home-manager ];
+    shell = pkgs.zsh;
+    uid = uid;
+  };
+}
diff --git a/hosts/common/users/nipsy/default.nix b/hosts/common/users/nipsy/default.nix
index 5eacd6f..9d5bfe6 100644
--- a/hosts/common/users/nipsy/default.nix
+++ b/hosts/common/users/nipsy/default.nix
@@ -1,9 +1,10 @@
 { pkgs, inputs, config, ... }:
 let
   ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
+  uid = 1000;
 in
 {
-  users.groups.nipsy.gid = 1000;
+  users.groups.nipsy.gid = uid;
   users.users.nipsy = {
     description = "Mark Nipper";
     extraGroups = [
@@ -26,5 +27,6 @@ in
 
     packages = [ pkgs.home-manager ];
     shell = pkgs.zsh;
+    uid = uid;
   };
 }