From 62476f2816aeeadf1fff657a6949eaafbac6df6e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 15:30:56 +0000
Subject: [PATCH] * Added a module for IceWM.

svn path=/nixos/trunk/; revision=19238
---
 .../services/x11/window-managers/icewm.nix    | 42 ++++++++++++++
 modules/services/x11/window-managers/twm.nix  | 58 +++++++++----------
 2 files changed, 70 insertions(+), 30 deletions(-)
 create mode 100644 modules/services/x11/window-managers/icewm.nix

diff --git a/modules/services/x11/window-managers/icewm.nix b/modules/services/x11/window-managers/icewm.nix
new file mode 100644
index 000000000000..1aec252dea57
--- /dev/null
+++ b/modules/services/x11/window-managers/icewm.nix
@@ -0,0 +1,42 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.xserver.windowManager.icewm;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+  
+    services.xserver.windowManager.icewm.enable = mkOption {
+      default = false;
+      description = "Enable the IceWM window manager.";
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    services.xserver.windowManager.session = singleton
+      { name = "icewm";
+        start =
+          ''
+            ${pkgs.icewm}/bin/icewm &
+            waitPID=$!
+          '';
+      };
+
+    environment.x11Packages = [ pkgs.icewm ];
+    
+  };
+
+}
diff --git a/modules/services/x11/window-managers/twm.nix b/modules/services/x11/window-managers/twm.nix
index 6b67934feb74..3c4780386ce9 100644
--- a/modules/services/x11/window-managers/twm.nix
+++ b/modules/services/x11/window-managers/twm.nix
@@ -1,44 +1,42 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mkIf;
+
   cfg = config.services.xserver.windowManager.twm;
-  xorg = pkgs.xorg;
 
-  option = { services = { xserver = { windowManager = {
-
-    twm = {
-      enable = mkOption {
-        default = false;
-        example = true;
-        description = "Enable the twm window manager.";
-      };
-
-    };
-
-  }; }; }; };
 in
 
-mkIf cfg.enable {
-  require = option;
+{
 
-  services = {
-    xserver = {
+  ###### interface
 
-      windowManager = {
-        session = [{
-          name = "twm";
-          start = "
-            ${xorg.twm}/bin/twm &
+  options = {
+  
+    services.xserver.windowManager.twm.enable = mkOption {
+      default = false;
+      description = "Enable the twm window manager.";
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    services.xserver.windowManager.session = singleton
+      { name = "twm";
+        start =
+          ''
+            ${pkgs.xorg.twm}/bin/twm &
             waitPID=$!
-          ";
-        }];
+          '';
       };
 
-    };
+    environment.x11Packages = [ pkgs.xorg.twm ];
+    
   };
 
-  environment = {
-    x11Packages = [ xorg.twm ];
-  };
 }