axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'main' into teutat3s

Browse source
This commit is contained in:
teutat3s 2021-11-19 00:52:10 +01:00
parent 45265e2014 91163d38ed
commit 54044ed31a
Signed by untrusted user: teutat3s
GPG key ID: 4FA1D3FA524F22C1
4 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/user/default.nix
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;

3
overlays/overrides.nix
View file

@ -15,6 +15,9 @@ channels: final: prev: {
nomad nomad
rage rage
signal-desktop signal-desktop
starship
deploy-rs
tdesktop
xdg-desktop-portal xdg-desktop-portal
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
xdg-desktop-portal-wlr xdg-desktop-portal-wlr

2
profiles/base-user/default.nix
View file

@ -15,7 +15,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 = ""; description = psCfg.user.description;
extraGroups = [ "wheel" "docker" "input" "audio" "video" "networkmanager" "lp" "scanner" ]; extraGroups = [ "wheel" "docker" "input" "audio" "video" "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;

2
profiles/base-user/session-variables.nix
View file

@ -49,7 +49,7 @@ let
CARGO_HOME = "${xdg.dataHome}/cargo"; CARGO_HOME = "${xdg.dataHome}/cargo";
# Java # Java
_JAVA_OPTIONS = "-Djava.util.prefs.userRoot = '${xdg.configHome}/java'"; _JAVA_OPTIONS = "-Djava.util.prefs.userRoot='${xdg.configHome}/java'";
_JAVA_AWT_WM_NONREPARENTING = "1"; _JAVA_AWT_WM_NONREPARENTING = "1";
# docker # docker