From 3bbaa3b60cb71456bba31b89d74acffb4152aec2 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 13 Apr 2012 14:52:25 +0000 Subject: [PATCH] slim display manager: enabled auto_login setting useful for demo/kiosk mode svn path=/nixos/trunk/; revision=33774 --- modules/services/x11/display-managers/slim.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix index 6e34bc2eb51..97c5f1d1b2b 100644 --- a/modules/services/x11/display-managers/slim.nix +++ b/modules/services/x11/display-managers/slim.nix @@ -16,8 +16,9 @@ let login_cmd exec ${pkgs.stdenv.shell} ${dmcfg.session.script} "%session" halt_cmd ${config.system.build.upstart}/sbin/shutdown -h now reboot_cmd ${config.system.build.upstart}/sbin/shutdown -r now - ${if cfg.defaultUser != "" then "default_user " + cfg.defaultUser else ""} - ${if cfg.hideCursor then "hidecursor true" else ""} + ${optionalString (cfg.defaultUser != "") ("default_user " + cfg.defaultUser)} + ${optionalString cfg.hideCursor "hidecursor true"} + ${optionalString cfg.autoLogin "auto_login yes"} ''; # Unpack the SLiM theme, or use the default. @@ -83,6 +84,14 @@ in ''; }; + autoLogin = mkOption { + default = false; + example = true; + description = '' + Automatically log in as the default user. + ''; + }; + }; };