1 files changed, 10 insertions, 23 deletions

diff --git a/users.nix b/users.nix
index 6f21c51d..06d465a2 100644
--- a/users.nix
+++ b/users.nix
@@ -1,30 +1,17 @@
-{config, ...}:
+{ config, lib, ...}:
+
+with lib;
 
 let
-  baseUsers = {
-    "gkleen" = import ./users/gkleen.nix;
-  };
-  extraUsers = {
-    ymir = {
-      "mherold" = import ./users/mherold.nix;
-      "some" = import ./users/some.nix;
-      "llovisa" = import ./users/llovisa.nix;
-      "vkleen" = import ./users/vkleen.nix;
-      "tkleen" = import ./users/tkleen.nix;
-      "mkleen" = import ./users/mkleen.nix;
-      "lkellers" = import ./users/lkellers.nix;
-      "mwgnr" = import ./users/mwagner.nix;
-      "ineumann" = import ./users/ineumann.nix;
-      "sselle" = import ./users/sselle.nix;
-      "sgoebels" = import ./users/sgoebels.nix;
-      "mtrinh" = import ./users/mtrinh.nix;
-    };
-    odin = {
-      "mherold" = import ./users/mherold.nix;
-    };
+  genUsersList = dirPath: concatLists (let contents = builtins.readDir dirPath; in map (name: (dirEntryToList."${contents."${name}"}" or (x: [])) "${dirPath}/${name}") (attrNames contents));
+  dirEntryToList = {
+    "regular" = path: [(import (builtins.toPath path))];
   };
+
+  users = genUsersList ./users;
   host = config.networking.hostName;
 in {
   users.mutableUsers = false;
-  users.extraUsers = baseUsers // (if builtins.hasAttr host extraUsers then builtins.getAttr host extraUsers else {});
+  users.extraUsers = listToAttrs
+    (map (user: nameValuePair (user.name) (removeAttrs user ["hosts" "allHosts"])) (filter (user: elem host (user.hosts or []) || (user.allHosts or false)) users));
 }