From 33a0873f6f0c91681261d96f76a95e32a8facf2c Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 11 Apr 2009 22:28:33 +0000
Subject: [PATCH] Add error messages to detect if the default (not override by
 the user) WM/DM is enable. Enable xterm desktop manager.

svn path=/nixos/branches/modular-nixos/; revision=14990
---
 upstart-jobs/xserver/desktopManager/default.nix | 6 +++---
 upstart-jobs/xserver/desktopManager/xterm.nix   | 4 ++--
 upstart-jobs/xserver/windowManager/default.nix  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/upstart-jobs/xserver/desktopManager/default.nix b/upstart-jobs/xserver/desktopManager/default.nix
index 7ea49571698..f0355381233 100644
--- a/upstart-jobs/xserver/desktopManager/default.nix
+++ b/upstart-jobs/xserver/desktopManager/default.nix
@@ -57,12 +57,12 @@ in
           description = "
             Default desktop manager loaded if none have been chosen.
           ";
-          merge = list:
-            let defaultDM = mergeOneOption list; in
+          merge = mergeOneOption;
+          apply = defaultDM:
             if any (w: w.name == defaultDM) cfg.session.list then
               defaultDM
             else
-              throw "Default desktop manager not found.";
+              throw "Default desktop manager ($(defaultDM)) not found.";
         };
       };
     };
diff --git a/upstart-jobs/xserver/desktopManager/xterm.nix b/upstart-jobs/xserver/desktopManager/xterm.nix
index e8aa0d289cb..7066c44527c 100644
--- a/upstart-jobs/xserver/desktopManager/xterm.nix
+++ b/upstart-jobs/xserver/desktopManager/xterm.nix
@@ -8,8 +8,8 @@ let
 
     xterm = {
       enable = mkOption {
-        default = false;
-        example = true;
+        default = true;
+        example = false;
         description = "Enable a xterm terminal as a desktop manager.";
       };
     };
diff --git a/upstart-jobs/xserver/windowManager/default.nix b/upstart-jobs/xserver/windowManager/default.nix
index cb5a1b674e0..5e33b58b3b1 100644
--- a/upstart-jobs/xserver/windowManager/default.nix
+++ b/upstart-jobs/xserver/windowManager/default.nix
@@ -45,12 +45,12 @@ in
           description = "
             Default window manager loaded if none have been chosen.
           ";
-          merge = list:
-            let defaultWM = mergeOneOption list; in
+          merge = mergeOneOption;
+          apply = defaultWM:
             if any (w: w.name == defaultWM) cfg.session then
               defaultWM
             else
-              throw "Default window manager not found.";
+              throw "Default window manager (${defaultWM}) not found.";
         };
       };
     };