--- upstart-jobs/xserver.nix	2009-01-19 18:39:59.000000000 -0500
+++ /root/nixos/upstart-jobs/xserver.nix	2009-01-19 19:00:03.000000000 -0500
@@ -12,7 +12,6 @@
   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
@@ -44,7 +43,6 @@
     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";
 
     
@@ -293,12 +291,6 @@
       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