fix: Change how enabled users are handled

This commit is contained in:
UGA Innovation Factory
2025-12-16 14:35:02 -05:00
committed by Hunter Halloran
parent 0ffdfdf0d8
commit 7ac453e1f7
10 changed files with 102 additions and 104 deletions

View File

@@ -43,7 +43,7 @@ let
# Load users.nix to find external user flakes
pkgs = nixpkgs.legacyPackages.${system};
usersData = import ../users.nix { inherit pkgs; };
accounts = usersData.ugaif.users.accounts or { };
accounts = usersData.ugaif.users or { };
# Extract flakeUrls and convert to modules
userFlakeModules = lib.mapAttrsToList (
@@ -87,7 +87,10 @@ let
];
specialConfig = lib.mkMerge [
(lib.optionalAttrs (configOverrides ? extraUsers) {
ugaif.users.enabledUsers = configOverrides.extraUsers;
# Enable each user in the extraUsers list
ugaif.users = lib.genAttrs configOverrides.extraUsers (_: {
enable = true;
});
})
(lib.optionalAttrs (configOverrides ? buildMethods) {
ugaif.host.buildMethods = configOverrides.buildMethods;