* Added a module for IceWM.

svn path=/nixos/trunk/; revision=19238

1 files changed, 25 insertions, 27 deletions

diff --git a/modules/services/x11/window-managers/twm.nix b/modules/services/x11/window-managers/twm.nix
index 6b67934feb7..3c4780386ce 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 = {
+in
 
-    twm = {
-      enable = mkOption {
-        default = false;
-        example = true;
-        description = "Enable the twm window manager.";
-      };
+{
+
+  ###### interface
 
+  options = {
+  
+    services.xserver.windowManager.twm.enable = mkOption {
+      default = false;
+      description = "Enable the twm window manager.";
     };
 
-  }; }; }; };
-in
+  };
+
 
-mkIf cfg.enable {
-  require = option;
+  ###### implementation
 
-  services = {
-    xserver = {
+  config = mkIf cfg.enable {
 
-      windowManager = {
-        session = [{
-          name = "twm";
-          start = "
-            ${xorg.twm}/bin/twm &
+    services.xserver.windowManager.session = singleton
+      { name = "twm";
+        start =
+          ''
+            ${pkgs.xorg.twm}/bin/twm &
             waitPID=$!
-          ";
-        }];
+          '';
       };
 
-    };
+    environment.x11Packages = [ pkgs.xorg.twm ];
+    
   };
 
-  environment = {
-    x11Packages = [ xorg.twm ];
-  };
 }