From 7f3566da8a74bcb013503c7439d8ec9568b6d8b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Fri, 28 Aug 2015 05:55:56 +0200 Subject: [PATCH] services.xserver.displayManager.gdm.autoLogin: add description --- nixos/modules/services/x11/display-managers/gdm.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 245c18ee2d9..ccf0f911081 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -25,6 +25,9 @@ in autoLogin = mkOption { default = {}; + description = '' + Auto login configuration attrset. + ''; type = types.submodule { options = { @@ -78,7 +81,7 @@ in users.extraGroups.gdm.gid = config.ids.gids.gdm; services.xserver.displayManager.job = - { + { environment = { GDM_X_SERVER = "${cfg.xserverBin} ${cfg.xserverArgs}"; GDM_SESSIONS_DIR = "${cfg.session.desktops}"; @@ -177,7 +180,7 @@ in "auth required pam_deny.so"} account sufficient pam_unix.so - + password requisite pam_unix.so nullok sha512 ${optionalString config.security.pam.enableEcryptfs "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}