Merge pull request #11450 from AndersonTorres/nixos-modules-window-managers

Getting rid of mkOption in NixOS window manager modules

nixos/modules/services/x11/window-managers/afterstep.nix

@@ -8,10 +8,7 @@ in
 {
   ###### interface
   options = {
-    services.xserver.windowManager.afterstep.enable = mkOption {
+    services.xserver.windowManager.afterstep.enable = mkEnableOption "afterstep";
-      default = false;
-      description = "Enable the Afterstep window manager.";
-    };
   };
 
   ###### implementation

nixos/modules/services/x11/window-managers/bspwm.nix

@@ -8,12 +8,7 @@ in
 
 {
   options = {
-    services.xserver.windowManager.bspwm.enable = mkOption {
+    services.xserver.windowManager.bspwm.enable = mkEnableOption "bspwm";
-      type = types.bool;
-      default = false;
-      example = true;
-      description = "Enable the bspwm window manager.";
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/x11/window-managers/clfswm.nix

@@ -8,14 +8,7 @@ in
 
 {
   options = {
-    services.xserver.windowManager.clfswm = {
+    services.xserver.windowManager.clfswm.enable = mkEnableOption "clfswm";
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        example = true;
-        description = "Enable the clfswm tiling window manager.";
-      };
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/x11/window-managers/compiz.nix

@@ -15,10 +15,7 @@ in
 
     services.xserver.windowManager.compiz = {
 
-      enable = mkOption {
+      enable = mkEnableOption "compiz";
-        default = false;
-        description = "Enable the Compiz window manager.";
-      };
 
       renderingFlag = mkOption {
         default = "";

nixos/modules/services/x11/window-managers/fluxbox.nix

@@ -8,11 +8,7 @@ in
 {
   ###### interface
   options = {
-    services.xserver.windowManager.fluxbox.enable = mkOption {
+    services.xserver.windowManager.fluxbox.enable = mkEnableOption "fluxbox";
-      default = false;
-      description = "Enable the Fluxbox window manager.";
-    };
-  };
 
   ###### implementation
   config = mkIf cfg.enable {

nixos/modules/services/x11/window-managers/herbstluftwm.nix

@@ -8,12 +8,7 @@ in
 
 {
   options = {
-    services.xserver.windowManager.herbstluftwm.enable = mkOption {
+    services.xserver.windowManager.herbstluftwm.enable = mkEnableOption "herbstluftwm";
-      type = types.bool;
-      default = false;
-      example = true;
-      description = "Enable the herbstluftwm window manager.";
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/x11/window-managers/i3.nix

@@ -9,11 +9,7 @@ in
 {
   options = {
     services.xserver.windowManager.i3 = {
-      enable = mkOption {
+      enable = mkEnableOption "i3";
-        default = false;
-        example = true;
-        description = "Enable the i3 tiling window manager.";
-      };
 
       configFile = mkOption {
         default = null;

nixos/modules/services/x11/window-managers/icewm.nix

@@ -8,7 +8,7 @@ in
 {
   ###### interface
   options = {
-    services.xserver.windowManager.icewm.enable = mkEnableOption "oroborus";
+    services.xserver.windowManager.icewm.enable = mkEnableOption "icewm";
   };
 
   ###### implementation

nixos/modules/services/x11/window-managers/metacity.nix

@@ -12,13 +12,7 @@ in
 
 {
   options = {
-
+    services.xserver.windowManager.metacity.enable = mkEnableOption "metacity";
-    services.xserver.windowManager.metacity.enable = mkOption {
-      default = false;
-      example = true;
-      description = "Enable the metacity window manager.";
-    };
-
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/x11/window-managers/notion.nix

@@ -8,13 +8,7 @@ in
 
 {
   options = {
-    services.xserver.windowManager.notion = {
+    services.xserver.windowManager.notion.enable = mkEnableOption "notion";
-      enable = mkOption {
-        default = false;
-        example = true;
-        description = "Enable the notion tiling window manager.";
-      };
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/x11/window-managers/openbox.nix

@@ -7,14 +7,7 @@ in
 
 {
   options = {
-    services.xserver.windowManager.openbox = {
+    services.xserver.windowManager.openbox.enable = mkEnableOption "oroborus";
-      enable = mkOption {
-        default = false;
-        example = true;
-        description = "Enable the Openbox window manager.";
-      };
-    };
-  };
 
   config = mkIf cfg.enable {
     services.xserver.windowManager = {

nixos/modules/services/x11/window-managers/ratpoison.nix

@@ -8,10 +8,7 @@ in
 {
   ###### interface
   options = {
-    services.xserver.windowManager.ratpoison.enable = mkOption {
+    services.xserver.windowManager.ratpoison.enable = mkEnableOption "ratpoison";
-      default = false;
-      description = "Enable the Ratpoison window manager.";
-    };
   };
 
   ###### implementation

nixos/modules/services/x11/window-managers/sawfish.nix

@@ -8,10 +8,7 @@ in
 {
   ###### interface
   options = {
-    services.xserver.windowManager.sawfish.enable = mkOption {
+    services.xserver.windowManager.sawfish.enable = mkEnableOption "sawfish";
-      default = false;
-      description = "Enable the Sawfish window manager.";
-    };
   };
 
   ###### implementation

nixos/modules/services/x11/window-managers/spectrwm.nix

@@ -9,13 +9,7 @@ in
 
 {
   options = {
-    services.xserver.windowManager.spectrwm = {
+    services.xserver.windowManager.spectrwm.enable = mkEnableOption "spectrwm";
-      enable = mkOption {
-        default = false;
-        example = true;
-        description = "Enable the spectrwm window manager.";
-      };
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/x11/window-managers/stumpwm.nix

@@ -8,14 +8,7 @@ in
 
 {
   options = {
-    services.xserver.windowManager.stumpwm = {
+    services.xserver.windowManager.stumpwm.enable = mkEnableOption "stumpwm";
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        example = true;
-        description = "Enable the stumpwm tiling window manager.";
-      };
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/x11/window-managers/twm.nix

@@ -13,12 +13,7 @@ in
   ###### interface
 
   options = {
-
+    services.xserver.windowManager.twm.enable = mkEnableOption "twm";
-    services.xserver.windowManager.twm.enable = mkOption {
-      default = false;
-      description = "Enable the twm window manager.";
-    };
-
   };
 
 

nixos/modules/services/x11/window-managers/windowmaker.nix

@@ -8,10 +8,7 @@ in
 {
   ###### interface
   options = {
-    services.xserver.windowManager.windowmaker.enable = mkOption {
+    services.xserver.windowManager.windowmaker.enable = mkEnableOption "windowmaker";
-      default = false;
-      description = "Enable the Windowmaker window manager.";
-    };
   };
 
   ###### implementation

nixos/modules/services/x11/window-managers/wmii.nix

@@ -7,11 +7,7 @@ let
 in
 {
   options = {
-    services.xserver.windowManager.wmii.enable = mkOption {
+    services.xserver.windowManager.wmii.enable = mkEnableOption "wmii";
-      default = false;
-      example = true;
-      description = "Enable the wmii window manager.";
-    };
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/x11/window-managers/xmonad.nix

@@ -13,12 +13,7 @@ in
 {
   options = {
     services.xserver.windowManager.xmonad = {
-      enable = mkOption {
+      enable = mkEnableOption "xmonad";
-        default = false;
-        example = true;
-        description = "Enable the xmonad window manager.";
-      };
-
       haskellPackages = mkOption {
         default = pkgs.haskellPackages;
         defaultText = "pkgs.haskellPackages";