Index: upstart-jobs/xserver.nix
===================================================================
--- upstart-jobs/xserver.nix	(revision 14010)
+++ upstart-jobs/xserver.nix	(working copy)
@@ -23,6 +23,7 @@
     nv =    { modules = [xorg.xf86videonv]; };
     ati =   { modules = [xorg.xf86videoati]; };
     via =   { modules = [xorg.xf86videovia]; };
+    radeonhd = { modules = [xorg.xf86videoradeonhd]; };
   };
 
   # Get a bunch of user settings.
@@ -44,6 +45,7 @@
     if wm != "" then wm else
     if sessionType == "gnome" then "metacity" else
     if sessionType == "kde" then "none" /* started by startkde */ else
+    if sessionType == "enlightenment" then "none" /* started by e16 */ else
     "twm";
 
     
@@ -292,6 +294,12 @@
       export XDG_DATA_DIRS=${pkgs.kdebase}/share
       exec ${pkgs.kdebase}/bin/startkde
 
+    '' else 
+
+      if sessionType == "enlightenment" then ''
+
+        exec ${pkgs.enlightenment}/bin/e16
+
     '' else ''
 
       # For all other session types, we currently just start a