diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
new file mode 100644
index 00000000000..2757c5de205
--- /dev/null
+++ b/upstart-jobs/xserver.nix
@@ -0,0 +1,458 @@
+{ config, pkgs, kernelPackages, kdePackages
+
+, # List of font directories.
+  fontDirectories
+}:
+
+let
+
+  inherit (pkgs.lib) optional isInList attrByPath;
+  
+  # Abbreviations.
+  cfg = config.services.xserver;
+  xorg = cfg.package;
+  gnome = pkgs.gnome;
+  stdenv = pkgs.stdenv;
+
+  knownVideoDrivers = {
+    nvidia = { modulesFirst = [ kernelPackages.nvidia_x11 ]; };  #make sure it first loads the nvidia libs
+    vesa =   { modules = [xorg.xf86videovesa]; };
+    vga =    { modules = [xorg.xf86videovga]; };
+    sis =    { modules = [xorg.xf86videosis]; };
+    i810 =   { modules = [xorg.xf86videoi810]; };
+    intel =  { modules = [xorg.xf86videointel]; };
+    nv =     { modules = [xorg.xf86videonv]; };
+    ati =    { modules = [xorg.xf86videoati]; };
+    openchrome = { modules = [xorg.xf86videoopenchrome]; };
+    cirrus = { modules = [xorg.xf86videocirrus]; };
+  };
+
+  # Get a bunch of user settings.
+  videoDriver = cfg.videoDriver;
+  resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
+  sessionType = cfg.sessionType;
+
+  videoDriverModules = attrByPath [ videoDriver ] (throw "unknown video driver: `${videoDriver}'") knownVideoDrivers;
+
+  
+  sessionCmd =
+    if sessionType == "" then cfg.sessionStarter else
+    if sessionType == "xterm" then "${pkgs.xterm}/bin/xterm -ls" else
+    if sessionType == "gnome" then "${gnome.gnometerminal}/bin/gnome-terminal -ls" else
+    abort ("unknown session type ${sessionType}");
+
+
+  windowManager =
+    let wm = cfg.windowManager; in
+    if wm != "" then wm else
+    if sessionType == "gnome" then "metacity" else
+    if sessionType == "kde" then "none" /* started by startkde */ else
+    if sessionType == "kde4" then "none" /* started by startkde */ else
+    "twm";
+
+    
+  modules = 
+    attrByPath ["modulesFirst"] [] videoDriverModules
+    ++ [
+      xorg.xorgserver
+      xorg.xf86inputevdev
+    ]
+    ++ attrByPath ["modules"] [] videoDriverModules
+    ++ (optional cfg.synaptics.enable ["${xorg.xf86inputsynaptics}"]);
+
+
+  fontsForXServer =
+    fontDirectories ++
+    # We don't want these fonts in fonts.conf, because then modern,
+    # fontconfig-based applications will get horrible bitmapped
+    # Helvetica fonts.  It's better to get a substitution (like Nimbus
+    # Sans) than that horror.  But we do need the Adobe fonts for some
+    # old non-fontconfig applications.  (Possibly this could be done
+    # better using a fontconfig rule.)
+    [ pkgs.xorg.fontadobe100dpi
+      pkgs.xorg.fontadobe75dpi
+    ];
+    
+
+  configFile = stdenv.mkDerivation {
+    name = "xserver.conf";
+    src = ./xserver.conf;
+    inherit fontsForXServer videoDriver resolutions;
+    isClone = if cfg.isClone then "on" else "off";
+
+    synapticsInputDevice = if cfg.synaptics.enable then ''
+      Section "InputDevice"
+        Identifier "Touchpad[0]"
+        Driver "synaptics"
+        Option "Device" "${cfg.synaptics.dev}"
+        Option "Protocol" "PS/2"
+        Option "LeftEdge" "1700"
+        Option "RightEdge" "5300"
+        Option "TopEdge" "1700"
+        Option "BottomEdge" "4200"
+        Option "FingerLow" "25"
+        Option "FingerHigh" "30"
+        Option "MaxTapTime" "180"
+        Option "MaxTapMove" "220"
+        Option "VertScrollDelta" "100"
+        Option "MinSpeed" "${cfg.synaptics.minSpeed}"
+        Option "MaxSpeed" "${cfg.synaptics.maxSpeed}"
+        Option "AccelFactor" "0.0010"
+        Option "SHMConfig" "on"
+        Option "Repeater" "/dev/input/mice"
+        Option "TapButton1" "1"
+        Option "TapButton2" "2"
+        Option "TapButton3" "3"
+	Option "VertTwoFingerScroll" "${if cfg.synaptics.twoFingerScroll then "1" else "0"}"
+	Option "HorizTwoFingerScroll" "${if cfg.synaptics.twoFingerScroll then "1" else "0"}"
+      EndSection
+    '' else "";
+
+    xkbOptions = if cfg.xkbOptions == "" then "" else  ''
+      Option "XkbOptions" "${cfg.xkbOptions}"
+    '';
+
+    setCorePointer = 
+      if cfg.synaptics.enable then ''
+        InputDevice "Touchpad[0]" "CorePointer"
+      '' else "";
+
+    internalAGPGART =
+      if cfg.useInternalAGPGART == "yes" then
+        ''  Option "UseInternalAGPGART" "yes"''
+      else if cfg.useInternalAGPGART == "no" then
+        ''  Option "UseInternalAGPGART" "no"''
+      else "";
+
+    extraDeviceConfig = cfg.extraDeviceConfig; 
+    extraMonitorSettings = cfg.extraMonitorSettings; 
+    extraDisplaySettings = cfg.extraDisplaySettings;
+    extraModules = cfg.extraModules; 
+    serverLayoutOptions = cfg.serverLayoutOptions; 
+    defaultDepth = cfg.defaultDepth; 
+    virtualScreen = if cfg.virtualScreen != null then 
+        "Virtual ${toString cfg.virtualScreen.x} ${toString cfg.virtualScreen.y}" 
+      else "";
+
+    xfs = if cfg.useXFS == false then "" else 
+      ''FontPath "${toString cfg.useXFS}"'';
+
+    buildCommand = ''
+      buildCommand= # urgh, don't substitute this
+
+      export fontPaths=
+      for i in $fontsForXServer; do
+        if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then
+          for j in $(find $i -name fonts.dir); do
+            fontPaths="''${fontPaths}FontPath \"$(dirname $j)\"''\n"
+          done
+        fi
+      done
+
+      export modulePaths=
+      for i in $(find ${toString modules} -type d); do
+        if ls $i/*.so* > /dev/null 2>&1; then
+          modulePaths="''${modulePaths}ModulePath \"$i\"''\n"
+        fi
+      done
+
+      export moduleSection=""
+      export screen=""
+      export device=""
+      export extensions=""
+
+
+      #if only my gf were this dirty
+      if test "${toString videoDriver}" == "nvidia"; then
+        export screen='
+          Option "AddARGBGLXVisuals" "true"
+          Option "DisableGLXRootClipping" "true"
+          Option "RandRRotation" "on"
+        '
+        
+        export device='
+          Option "RenderAccel" "true"
+          Option "AllowGLXWithComposite" "true"
+          Option "AddARGBGLXVisuals" "true"
+        '
+        
+        export extensions='
+          Option "Composite" "Enable"
+        '
+      fi
+        
+      if [ "${toString videoDriver}" = i810 ]; then
+        export extensions='
+          Option "Composite" "Enable"
+        ';
+      fi;
+
+      if [ "${toString videoDriver}" = ati ]; then
+        export extensions='
+          Option "Composite" "Enable"
+        ';
+      fi;
+
+      if [ "${toString videoDriver}" = radeonhd ]; then
+        export extensions='
+          Option "Composite" "Enable"
+        ';
+      fi;
+
+      substituteAll $src $out
+    ''; # */
+  };
+
+
+  clientScript = pkgs.writeText "xclient" ''
+
+    source /etc/profile
+
+    exec > $HOME/.Xerrors 2>&1
+
+
+    ### Load X defaults.
+    if test -e ~/.Xdefaults; then
+      ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
+    fi
+
+
+    ${if cfg.startSSHAgent then ''
+      ### Start the SSH agent.
+      export SSH_ASKPASS=${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass
+      eval $(${pkgs.openssh}/bin/ssh-agent)
+    '' else ""}
+
+    ### Allow user to override system-wide configuration
+    if test -f ~/.xsession; then
+        source ~/.xsession;
+    fi
+  
+
+    ### Start a window manager.
+  
+    ${if windowManager == "twm" then ''
+      ${xorg.twm}/bin/twm &
+    ''
+
+    else if windowManager == "metacity" then ''
+      env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
+      # !!! Hack: load the schemas for Metacity.
+      GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
+        --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas
+      ${gnome.metacity}/bin/metacity &
+    ''
+
+    else if windowManager == "kwm" then ''
+      ${pkgs.kdebase}/bin/kwin &
+    ''
+
+    else if windowManager == "compiz" then ''
+      # !!! Hack: load the schemas for Compiz.
+      GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
+        --makefile-install-rule ${pkgs.compiz}/etc/gconf/schemas/*.schemas
+
+      # !!! Hack: turn on most Compiz modules.
+      ${gnome.GConf}/bin/gconftool-2 -t list --list-type=string \
+        --set /apps/compiz/general/allscreens/options/active_plugins \
+        [gconf,png,decoration,wobbly,fade,minimize,move,resize,cube,switcher,rotate,place,scale,water]
+
+      # Start Compiz and the GTK-style window decorator.
+      env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
+      ${pkgs.compiz}/bin/compiz gconf ${cfg.renderingFlag} &
+      ${pkgs.compiz}/bin/gtk-window-decorator --sync &
+    ''
+
+    else if windowManager == "xmonad" then ''
+      ${pkgs.haskellPackages.xmonad}/bin/xmonad &
+    ''
+    
+    else if windowManager == "none" then ''
+      # The session starter will start the window manager.
+    ''
+
+    else abort ("unknown window manager " + windowManager)}
+
+
+    ### Show a background image.
+    # (but not if we're starting a full desktop environment that does it for us)
+    ${if sessionType != "kde" && sessionType != "kde4" then ''
+    
+      if test -e $HOME/.background-image; then
+        ${pkgs.feh}/bin/feh --bg-scale $HOME/.background-image
+      fi
+      
+    '' else ""}
+    
+
+    ### Start the session.
+    ${if sessionType == "kde" then ''
+
+      # A quick hack to make KDE screen locking work.  It calls
+      # kcheckpass, which needs to be setuid in order to read the
+      # shadow password file.  We have a setuid wrapper around
+      # kcheckpass.  However, startkde adds $kdebase/bin to the start
+      # of $PATH if it's not already in $PATH, thus overriding the
+      # setuid wrapper directory.  So here we add $kdebase/bin to the
+      # end of $PATH to keep startkde from doing that.
+      export PATH=$PATH:${pkgs.kdebase}/bin
+
+      # Start KDE.
+      exec ${pkgs.kdebase}/bin/startkde
+
+    '' else if sessionType == "kde4" then ''
+
+      # Start KDE.
+      exec ${pkgs.kde42.kdebase_workspace}/bin/startkde
+
+    '' else ''
+
+      # For all other session types, we currently just start a
+      # terminal of the kind indicated by sessionCmd.
+      # !!! yes, this means that you 'log out' by killing the X server.
+      while ${sessionCmd}; do
+        sleep 1  
+      done
+
+    ''}
+    
+  ''; # */
+
+
+  xserverArgs = [
+    "-ac"
+    "-logverbose"
+    "-verbose"
+    "-terminate"
+    "-logfile" "/var/log/X.${toString cfg.display}.log"
+    "-config ${configFile}"
+    ":${toString cfg.display}" "vt${toString cfg.tty}"
+    "-xkbdir" "${pkgs.xkeyboard_config}/etc/X11/xkb"
+  ] ++ optional (!config.services.xserver.tcpEnable) "-nolisten tcp";
+
+  
+  slimConfig = pkgs.writeText "slim.cfg" ''
+    xauth_path ${xorg.xauth}/bin/xauth
+    default_xserver ${xorg.xorgserver}/bin/X
+    xserver_arguments ${toString xserverArgs}
+    login_cmd exec ${stdenv.bash}/bin/sh ${clientScript}
+    halt_cmd ${pkgs.upstart}/sbin/shutdown -h now
+    reboot_cmd ${pkgs.upstart}/sbin/shutdown -r now
+    ${if cfg.slim.defaultUser != "" then "default_user " + cfg.slim.defaultUser else ""}
+    ${if cfg.slim.hideCursor then "hidecursor true" else ""}
+  '';
+
+
+  # Unpack the SLiM theme, or use the default.
+  slimThemesDir =
+    let
+      unpackedTheme = stdenv.mkDerivation {
+        name = "slim-theme";
+        buildCommand = ''
+          ensureDir $out
+          cd $out
+          unpackFile ${cfg.slim.theme}
+          ln -s * default
+        '';
+      };
+    in if cfg.slim.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme;       
+
+
+in
+
+
+rec {
+  name = "xserver";
+
+  
+  extraPath = [
+    xorg.xrandr
+    xorg.xrdb
+    xorg.setxkbmap
+    xorg.iceauth # required for KDE applications (it's called by dcopserver)
+    pkgs.feh
+  ]
+  ++ optional (windowManager == "twm") [
+    xorg.twm
+  ]
+  ++ optional (windowManager == "metacity") [
+    gnome.metacity
+  ]
+  ++ optional (windowManager == "compiz") [
+    pkgs.compiz
+  ]
+  ++ optional (sessionType == "xterm") [
+    pkgs.xterm
+  ]
+  ++ optional (sessionType == "gnome") [
+    gnome.gnometerminal
+    gnome.GConf
+    gnome.gconfeditor
+  ]
+  ++ optional (sessionType == "kde") [
+    xorg.xset # used by startkde, non-essential
+  ]
+  ++ optional (sessionType == "kde4") [
+    xorg.xmessage # so that startkde can show error messages
+    pkgs.qt4 # needed for qdbus
+    xorg.xset # used by startkde, non-essential
+  ]
+  ++ optional (videoDriver == "nvidia") [
+    kernelPackages.nvidia_x11
+  ]
+  ++ kdePackages;
+
+
+  extraEtc =
+    optional (sessionType == "kde" || sessionType == "kde4")
+      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+        target = "X11/xkb";
+      }
+    ++
+    optional cfg.exportConfiguration
+      { source = "${configFile}";
+        target = "X11/xorg.conf";
+      };
+
+    
+  # The X server needs HAL running
+  job = assert config.services.hal.enable; ''
+    start on ${if cfg.autorun then "hal" else "never"}
+
+    start script
+    
+      rm -f /var/run/opengl-driver
+      ${if videoDriver == "nvidia"        
+        then ''
+          ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver
+        ''
+        else if cfg.driSupport
+        then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
+        else ""
+       }
+
+      rm -f /var/log/slim.log
+
+      rm -f /tmp/.X0-lock
+       
+    end script
+
+    env SLIM_CFGFILE=${slimConfig}
+    env SLIM_THEMESDIR=${slimThemesDir}
+    env FONTCONFIG_FILE=/etc/fonts/fonts.conf # !!! cleanup
+    env XKB_BINDIR=${xorg.xkbcomp}/bin # Needed for the Xkb extension.
+
+    ${if videoDriver == "nvidia" 
+      then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib" 
+      else ""
+    }
+
+    ${if videoDriver != "nvidia"
+      then "env XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/dri"
+      else ""
+    }
+
+    exec ${pkgs.slim}/bin/slim
+  '';
+  
+}