public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/lightdm: More changes

Browse Source
This commit is contained in:
William A. Kennington III 2015-05-21 19:06:03 -07:00
parent 688e9ea04c
commit 4f943ef237
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
nixos/modules/services/x11/display-managers/lightdm.nix
View File

@ -124,11 +124,6 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
assertions = [ {
assertion = !config.services.accounts-daemon.enable;
message = "Lightdm does not properly support gnome accountservice";
} ];
services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.slim.enable = false;
services.xserver.displayManager.job = { services.xserver.displayManager.job = {
@ -148,8 +143,26 @@ in
services.dbus.enable = true; services.dbus.enable = true;
services.dbus.packages = [ lightdm ]; services.dbus.packages = [ lightdm ];
security.pam.services.lightdm = { allowNullPassword = true; startSession = true; }; security.pam.services.lightdm = {
security.pam.services.lightdm-greeter = { allowNullPassword = true; startSession = true; }; allowNullPassword = true;
startSession = true;
};
security.pam.services.lightdm-greeter = {
allowNullPassword = true;
startSession = true;
text = ''
auth required pam_env.so
auth required pam_permit.so
account required pam_permit.so
password required pam_deny.so
session required pam_env.so envfile=${config.system.build.pamEnvironment}
session required pam_unix.so
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
'';
};
users.extraUsers.lightdm = { users.extraUsers.lightdm = {
createHome = true; createHome = true;