1 files changed, 14 insertions, 19 deletions
diff --git a/sys/users.nix b/sys/users.nix
index 8c8be6b..b84d1c0 100644
--- a/sys/users.nix
+++ b/sys/users.nix
@@ -1,7 +1,8 @@
 { lib, config, pkgs, ... }:
 with lib; let
   cfg = config.local;
-in {
+in
+{
   config = {
     sound.enable = true;
     hardware.pulseaudio.enable = true;
@@ -24,27 +25,21 @@ in {
 
     environment.pathsToLink = [ "/share/zsh" ];
 
-    users.users = {
-      ale = {
+    users.users = mapAttrs
+      (username: user: {
         isNormalUser = true;
-        uid = 1000;
-        group = "ale";
-        extraGroups = [ "users" "wheel" "adbusers" ];
-        shell = pkgs.zsh;
-      };
 
-      tutorias = {
-        isNormalUser = true;
-        uid = 1004;
-        group = "tutorias";
-        extraGroups = [ "users" ];
-        shell = pkgs.zsh;
-      };
-    };
+        inherit (user) uid;
+        description = user.gecos;
+
+        group = username;
+        extraGroups = [ "users" ] ++ user.groups;
+
+        shell = if user.allowLogin then pkgs.zsh else null;
+      })
+      cfg.users;
 
-    users.groups = {
-      ale.gid = 1001;
-      tutorias.gid = 1007;
+    users.groups = mapAttrs (_: user: { inherit (user) gid; }) cfg.users // {
       adbusers.gid = 1008;
     };
   };