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

Some kdm fixes

Browse Source 
svn path=/nixos/trunk/; revision=15519
This commit is contained in:
Sander van der Burg 2009-05-09 21:00:02 +00:00
parent 5b368b22bf
commit 7aa1c2439c
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
upstart-jobs/kdm.nix
View File

@ -3,7 +3,7 @@
let let
# Abbreviations. # Abbreviations.
cfg = config.services.xserver; cfg = config.services.xserver;
xorg = pkgs.xlibs; xorg = cfg.package;
inherit (pkgs.lib) optional isInList getAttr; inherit (pkgs.lib) optional isInList getAttr;
stdenv = pkgs.stdenv; stdenv = pkgs.stdenv;
@ -26,7 +26,7 @@ let
resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions); resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
sessionType = cfg.sessionType; sessionType = cfg.sessionType;
videoDriverModules = getAttr [ videoDriver ] (throw "unkown video driver : \"${videoDriver}\"") knownVideoDrivers; videoDriverModules = getAttr [ videoDriver ] (throw "unknown video driver: `${videoDriver}'") knownVideoDrivers;
modules = modules =
@ -90,10 +90,10 @@ let
Option "XkbOptions" "${cfg.xkbOptions}" Option "XkbOptions" "${cfg.xkbOptions}"
''; '';
xkbModel = cfg.xkbModel; setCorePointer =
layout = cfg.layout; if cfg.synaptics.enable then ''
InputDevice "Touchpad[0]" "CorePointer"
corePointer = if cfg.synaptics.enable then "Touchpad[0]" else "Mouse[0]"; '' else "";
internalAGPGART = internalAGPGART =
if cfg.useInternalAGPGART == "yes" then if cfg.useInternalAGPGART == "yes" then
@ -181,30 +181,32 @@ let
''; # */ ''; # */
}; };
xsession = pkgs.writeText "Xsession" '' xsession = pkgs.writeText "Xsession" ''
source /etc/profile source /etc/profile
session=$1 session=$1
export PATH=$PATH:${pkgs.xterm}/bin:${pkgs.qt4}/bin:${pkgs.dbus.libs}/bin:${pkgs.kde42.kdelibs}/bin:${pkgs.xlibs.xset}/bin:${pkgs.xlibs.xsetroot}/bin:${pkgs.xlibs.xmessage}/bin:${pkgs.xlibs.xprop}/bin export PATH=$PATH:${pkgs.xterm}/bin:${pkgs.qt4}/bin:${pkgs.dbus.libs}/bin:${pkgs.kde42.kdelibs}/bin:${pkgs.kde42.kdebase_workspace}/bin:${pkgs.xlibs.xset}/bin:${pkgs.xlibs.xsetroot}/bin:${pkgs.xlibs.xmessage}/bin:${pkgs.xlibs.xprop}/bin
export XDG_CONFIG_DIRS= export XDG_CONFIG_DIRS=
export XDG_DATA_DIRS=${pkgs.shared_mime_info}/share export XDG_DATA_DIRS=${pkgs.shared_mime_info}/share
export KDEDIRS=${pkgs.kde42.kdelibs}:${pkgs.kde42.kdebase_workspace}
case $session in case $session in
"") "")
exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
;; ;;
failsafe) failsafe)
exec xterm -geometry 80x24-0-0 xterm -geometry 80x24-0-0
;; ;;
custom) custom)
exec $HOME/.xsession $HOME/.xsession
;; ;;
default) default)
exec ${pkgs.kde42.kdebase_workspace}/bin/startkde startkde
;; ;;
*) *)
eval exec "$session" eval "$session"
;; ;;
esac esac
@ -231,7 +233,7 @@ let
in in
{ {
name = "kdm"; name = "kdm";
job = '' job = ''
description "KDE Display Manager" description "KDE Display Manager"