diff -ruN nixos/upstart-jobs/xserver.nix nixos_new/upstart-jobs/xserver.nix
--- nixos/upstart-jobs/xserver.nix	2009-01-20 22:29:21.000000000 -0500
+++ nixos_new/upstart-jobs/xserver.nix	2009-01-20 22:37:35.000000000 -0500
@@ -12,6 +12,7 @@
   xorg = cfg.package;
   gnome = pkgs.gnome;
   stdenv = pkgs.stdenv;
+  enlightenment = pkgs.enlightenment;
 
   knownVideoDrivers = {
     nvidia = { modulesFirst = [ kernelPackages.nvidiaDrivers ]; };  #make sure it first loads the nvidia libs
@@ -43,6 +44,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";
 
     
@@ -291,6 +293,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