6596a3ec55
default session is selected. This is because we always want to run our own initialisation (like starting ssh-agent). * ssh-agent: don't start it is a child but have it re-exec the xsession script. This ensures that ssh-agent quits when we log out. * In the xsession script, don't redirect output to ~/.xsession-errors if the display manager is kdm, since kdm already does that. In fact it uses ~/.xsession-errors<optional number> if there are concurrent X sessions. * For consistency with other distros and the xdm manpage, exec the ~/.xsession script instead of sourcing it. Do this for the "custom" session type provided by kdm. svn path=/nixos/trunk/; revision=17087
87 lines
1.8 KiB
Nix
87 lines
1.8 KiB
Nix
{pkgs, config, ...}:
|
|
|
|
with pkgs.lib;
|
|
|
|
let
|
|
|
|
dmcfg = config.services.xserver.displayManager;
|
|
cfg = dmcfg.kdm;
|
|
|
|
inherit (pkgs.kde4) kdebase_workspace;
|
|
|
|
defaultConfig =
|
|
''
|
|
[Shutdown]
|
|
HaltCmd=${pkgs.upstart}/sbin/halt
|
|
RebootCmd=${pkgs.upstart}/sbin/reboot
|
|
|
|
[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}
|
|
# 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
|
|
'';
|
|
|
|
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.
|
|
'';
|
|
};
|
|
|
|
extraConfig = mkOption {
|
|
default = "";
|
|
description = ''
|
|
Options appended to <filename>kdmrc</filename>, the
|
|
configuration file of KDM.
|
|
'';
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
###### implementation
|
|
|
|
config = mkIf cfg.enable {
|
|
|
|
services.xserver.displayManager.job =
|
|
{ execCmd = "${kdebase_workspace}/bin/kdm -config ${kdmrc}";
|
|
logsXsession = true;
|
|
};
|
|
|
|
security.pam.services = [ { name = "kde"; localLogin = true; ckHack = true; } ];
|
|
|
|
};
|
|
|
|
}
|