6e118cd66b
and enabled desktop manager (e.g. "kde" if KDE is enabled, and
"xterm" if nothing is explicitly enabled). This means that you
don't have to write
services.xserver.desktopManager.default = "kde4";
anymore in addition to
services.xserver.desktopManager.kde4.enable = true;
to make KDE the default desktop environment.
* Remove the "none + none" session type.
* Remove the "+ none" string at the end of session types. I.e. now
it's "kde", not "kde + none".
* In kdm, add coreutils to its SystemPath so that it can remove the
temporary directories in /tmp that it creates.
svn path=/nixos/trunk/; revision=23036
111 lines
2.6 KiB
Nix
111 lines
2.6 KiB
Nix
{pkgs, config, ...}:
|
|
|
|
with pkgs.lib;
|
|
|
|
let
|
|
|
|
dmcfg = config.services.xserver.displayManager;
|
|
cfg = dmcfg.kdm;
|
|
|
|
inherit (pkgs.kde4) kdebase_workspace;
|
|
|
|
defaultConfig =
|
|
''
|
|
[Shutdown]
|
|
HaltCmd=${config.system.build.upstart}/sbin/halt
|
|
RebootCmd=${config.system.build.upstart}/sbin/reboot
|
|
${optionalString (config.system.boot.loader.id == "grub") ''
|
|
BootManager=Grub
|
|
''}
|
|
|
|
[X-*-Core]
|
|
Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb
|
|
SessionsDirs=${dmcfg.session.desktops}
|
|
Session=${dmcfg.session.script}
|
|
FailsafeClient=${pkgs.xterm}/bin/xterm
|
|
|
|
[X-:*-Core]
|
|
ServerCmd=${dmcfg.xserverBin} ${dmcfg.xserverArgs}
|
|
# KDM calls `rm' somewhere to clean up some temporary directory.
|
|
SystemPath=${pkgs.coreutils}/bin
|
|
# The default timeout (15) is too short in a heavily loaded boot process.
|
|
ServerTimeout=60
|
|
# Needed to prevent the X server from dying on logout and not coming back:
|
|
TerminateServer=true
|
|
|
|
[X-*-Greeter]
|
|
HiddenUsers=root,nixbld1,nixbld2,nixbld3,nixbld4,nixbld5,nixbld6,nixbld7,nixbld8,nixbld9,nixbld10
|
|
PluginsLogin=${kdebase_workspace}/lib/kde4/kgreet_classic.so
|
|
|
|
${optionalString (cfg.enableXDMCP)
|
|
''
|
|
[Xdmcp]
|
|
Enable=true
|
|
''}
|
|
'';
|
|
|
|
kdmrc = pkgs.stdenv.mkDerivation {
|
|
name = "kdmrc";
|
|
config = defaultConfig + cfg.extraConfig;
|
|
buildCommand =
|
|
''
|
|
echo "$config" > $out
|
|
cat ${kdebase_workspace}/share/config/kdm/kdmrc >> $out
|
|
'';
|
|
};
|
|
|
|
in
|
|
|
|
{
|
|
|
|
###### interface
|
|
|
|
options = {
|
|
|
|
services.xserver.displayManager.kdm = {
|
|
|
|
enable = mkOption {
|
|
default = false;
|
|
description = ''
|
|
Whether to enable the KDE display manager.
|
|
'';
|
|
};
|
|
|
|
enableXDMCP = mkOption {
|
|
default = false;
|
|
description = ''
|
|
Whether to enable XDMCP, which allows remote logins.
|
|
'';
|
|
};
|
|
|
|
extraConfig = mkOption {
|
|
default = "";
|
|
description = ''
|
|
Options appended to <filename>kdmrc</filename>, the
|
|
configuration file of KDM.
|
|
'';
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
###### implementation
|
|
|
|
config = mkIf cfg.enable {
|
|
|
|
services.xserver.displayManager.slim.enable = false;
|
|
|
|
services.xserver.displayManager.job =
|
|
{ execCmd =
|
|
(optionalString (config.system.boot.loader.id == "grub") "PATH=${config.system.build.grub}/sbin:$PATH ") +
|
|
"exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon";
|
|
logsXsession = true;
|
|
};
|
|
|
|
security.pam.services = [ { name = "kde"; } ];
|
|
|
|
};
|
|
|
|
}
|