fix(ci): fix flake evaluation, pure modulesPath, user attrset, and add Gitea Packages upload
Test NaxOS Module Configurations / test-modules (push) Successful in 1m56s
Test NaxOS Module Configurations / test-modules (push) Successful in 1m56s
This commit is contained in:
+11
-12
@@ -58,22 +58,21 @@ in {
|
||||
config = mkIf cfg.enable {
|
||||
users.mutableUsers = true;
|
||||
|
||||
# Admin user creation
|
||||
users.users.${cfg.adminUser} = {
|
||||
isNormalUser = true;
|
||||
description = "NaxOS Primary Administrator";
|
||||
extraGroups = [ "wheel" "docker" "video" "render" "users" ];
|
||||
openssh.authorizedKeys.keys = cfg.adminSshKeys;
|
||||
shell = pkgs.bashInteractive;
|
||||
};
|
||||
|
||||
# Additional users
|
||||
users.users = mapAttrs (name: ucfg: {
|
||||
# Admin and additional user creation
|
||||
users.users = {
|
||||
${cfg.adminUser} = {
|
||||
isNormalUser = true;
|
||||
description = "NaxOS Primary Administrator";
|
||||
extraGroups = [ "wheel" "docker" "video" "render" "users" ];
|
||||
openssh.authorizedKeys.keys = cfg.adminSshKeys;
|
||||
shell = pkgs.bashInteractive;
|
||||
};
|
||||
} // (mapAttrs (name: ucfg: {
|
||||
isNormalUser = true;
|
||||
description = ucfg.description;
|
||||
extraGroups = (if ucfg.isAdmin then [ "wheel" ] else []) ++ ucfg.extraGroups ++ [ "users" ];
|
||||
openssh.authorizedKeys.keys = ucfg.sshKeys;
|
||||
}) cfg.users;
|
||||
}) cfg.users);
|
||||
|
||||
security.sudo.wheelNeedsPassword = false;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user