b12f restructure #1

Merged
teutat3s merged 218 commits from b12f into main 2020-11-24 18:27:01 +00:00
2 changed files with 6 additions and 1 deletions
Showing only changes of commit cfe5d77f9e - Show all commits

View file

@ -11,6 +11,11 @@ in
type = types.nullOr types.str; type = types.nullOr types.str;
default = "nixos"; default = "nixos";
}; };
description = mkOption {
description = "User description";
type = types.nullOr types.str;
default = "The main PubSolarOS user";
};
password = mkOption { password = mkOption {
description = "User password"; description = "User password";
type = types.nullOr types.str; type = types.nullOr types.str;

View file

@ -12,7 +12,7 @@ in
# This automatically sets group to users, createHome to true, # This automatically sets group to users, createHome to true,
# home to /home/username, useDefaultShell to true, and isSystemUser to false. # home to /home/username, useDefaultShell to true, and isSystemUser to false.
isNormalUser = true; isNormalUser = true;
description = "The main PubSolarOS user"; description = psCfg.user.description;
extraGroups = [ "wheel" "docker" "input" "audio" "networkmanager" "lp" "scanner" ]; extraGroups = [ "wheel" "docker" "input" "audio" "networkmanager" "lp" "scanner" ];
initialHashedPassword = if psCfg.user.password != null then psCfg.user.password else ""; initialHashedPassword = if psCfg.user.password != null then psCfg.user.password else "";
shell = pkgs.zsh; shell = pkgs.zsh;