Tons of changes, I guess?

lib/fudo/users.nix

@@ -65,34 +65,17 @@ in {
     };
   };
 
-  imports = [ ./users-common.nix ];
-
   config = let
     sys = config.instance;
   in {
-    fudo.auth.ldap-server = let
-      ldapUsers = (filterAttrs
-        (username: userOpts: userOpts.ldap-hashed-password != null))
+    fudo.auth.ldap-server = {
+      users = filterAttrs
+        (username: userOpts: userOpts.ldap-hashed-passwd != null)
         config.fudo.users;
 
-    in {
-      users = mapAttrs (username: userOpts: {
-        uid = userOpts.uid;
-        group = userOpts.primary-group;
-        common-name = userOpts.common-name;
-        hashed-password = userOpts.ldap-hashed-password;
-      }) ldapUsers;
+      groups = config.fudo.groups;
 
-      groups = mapAttrs (groupname: groupOpts: {
-        gid = groupOpts.gid-number;
-        description = groupOpts.description;
-        members = filterExistingUsers ldapUsers groupOpts.members;
-      }) config.fudo.groups;
-
-      system-users = mapAttrs (username: userOpts: {
-        description = userOpts.description;
-        hashed-password = userOpts.ldap-hashed-passwd;
-      }) config.fudo.system-users;
+      system-users = config.fudo.system-users;
     };
 
     programs.ssh.extraConfig = mkAfter ''
@@ -161,9 +144,6 @@ in {
       in admin-entries // user-entries;
     };
 
-    # TODO: This is NOT where this should be...
-    home-manager.useGlobalPkgs = true;
-
     # Group home directories have to exist, otherwise users can't log in
     systemd.services = let
       ensure-group-directories = group: