Getting rid of mkOption in NixOS window manager modules

Now the default way to define NixOS window manager modules is to use
mkEnableOption to describe the module itself.
In this commit, all files on nixos/modules/services/x11/window-managers
are changed.

+1 -4
nixos/modules/services/x11/window-managers/afterstep.nix
···
{
###### interface
options = {
-
services.xserver.windowManager.afterstep.enable = mkOption {
-
default = false;
-
description = "Enable the Afterstep window manager.";
-
};
+
services.xserver.windowManager.afterstep.enable = mkEnableOption "afterstep";
};
###### implementation
+1 -6
nixos/modules/services/x11/window-managers/bspwm.nix
···
{
options = {
-
services.xserver.windowManager.bspwm.enable = mkOption {
-
type = types.bool;
-
default = false;
-
example = true;
-
description = "Enable the bspwm window manager.";
-
};
+
services.xserver.windowManager.bspwm.enable = mkEnableOption "bspwm";
};
config = mkIf cfg.enable {
+1 -8
nixos/modules/services/x11/window-managers/clfswm.nix
···
{
options = {
-
services.xserver.windowManager.clfswm = {
-
enable = mkOption {
-
type = types.bool;
-
default = false;
-
example = true;
-
description = "Enable the clfswm tiling window manager.";
-
};
-
};
+
services.xserver.windowManager.clfswm.enable = mkEnableOption "clfswm";
};
config = mkIf cfg.enable {
+1 -4
nixos/modules/services/x11/window-managers/compiz.nix
···
services.xserver.windowManager.compiz = {
-
enable = mkOption {
-
default = false;
-
description = "Enable the Compiz window manager.";
-
};
+
enable = mkEnableOption "compiz";
renderingFlag = mkOption {
default = "";
+1 -5
nixos/modules/services/x11/window-managers/fluxbox.nix
···
{
###### interface
options = {
-
services.xserver.windowManager.fluxbox.enable = mkOption {
-
default = false;
-
description = "Enable the Fluxbox window manager.";
-
};
-
};
+
services.xserver.windowManager.fluxbox.enable = mkEnableOption "fluxbox";
###### implementation
config = mkIf cfg.enable {
+1 -6
nixos/modules/services/x11/window-managers/herbstluftwm.nix
···
{
options = {
-
services.xserver.windowManager.herbstluftwm.enable = mkOption {
-
type = types.bool;
-
default = false;
-
example = true;
-
description = "Enable the herbstluftwm window manager.";
-
};
+
services.xserver.windowManager.herbstluftwm.enable = mkEnableOption "herbstluftwm";
};
config = mkIf cfg.enable {
+1 -5
nixos/modules/services/x11/window-managers/i3.nix
···
{
options = {
services.xserver.windowManager.i3 = {
-
enable = mkOption {
-
default = false;
-
example = true;
-
description = "Enable the i3 tiling window manager.";
-
};
+
enable = mkEnableOption "i3";
configFile = mkOption {
default = null;
+1 -1
nixos/modules/services/x11/window-managers/icewm.nix
···
{
###### interface
options = {
-
services.xserver.windowManager.icewm.enable = mkEnableOption "oroborus";
+
services.xserver.windowManager.icewm.enable = mkEnableOption "icewm";
};
###### implementation
+1 -7
nixos/modules/services/x11/window-managers/metacity.nix
···
{
options = {
-
-
services.xserver.windowManager.metacity.enable = mkOption {
-
default = false;
-
example = true;
-
description = "Enable the metacity window manager.";
-
};
-
+
services.xserver.windowManager.metacity.enable = mkEnableOption "metacity";
};
config = mkIf cfg.enable {
+1 -7
nixos/modules/services/x11/window-managers/notion.nix
···
{
options = {
-
services.xserver.windowManager.notion = {
-
enable = mkOption {
-
default = false;
-
example = true;
-
description = "Enable the notion tiling window manager.";
-
};
-
};
+
services.xserver.windowManager.notion.enable = mkEnableOption "notion";
};
config = mkIf cfg.enable {
+1 -8
nixos/modules/services/x11/window-managers/openbox.nix
···
{
options = {
-
services.xserver.windowManager.openbox = {
-
enable = mkOption {
-
default = false;
-
example = true;
-
description = "Enable the Openbox window manager.";
-
};
-
};
-
};
+
services.xserver.windowManager.openbox.enable = mkEnableOption "oroborus";
config = mkIf cfg.enable {
services.xserver.windowManager = {
+1 -4
nixos/modules/services/x11/window-managers/ratpoison.nix
···
{
###### interface
options = {
-
services.xserver.windowManager.ratpoison.enable = mkOption {
-
default = false;
-
description = "Enable the Ratpoison window manager.";
-
};
+
services.xserver.windowManager.ratpoison.enable = mkEnableOption "ratpoison";
};
###### implementation
+1 -4
nixos/modules/services/x11/window-managers/sawfish.nix
···
{
###### interface
options = {
-
services.xserver.windowManager.sawfish.enable = mkOption {
-
default = false;
-
description = "Enable the Sawfish window manager.";
-
};
+
services.xserver.windowManager.sawfish.enable = mkEnableOption "sawfish";
};
###### implementation
+1 -7
nixos/modules/services/x11/window-managers/spectrwm.nix
···
{
options = {
-
services.xserver.windowManager.spectrwm = {
-
enable = mkOption {
-
default = false;
-
example = true;
-
description = "Enable the spectrwm window manager.";
-
};
-
};
+
services.xserver.windowManager.spectrwm.enable = mkEnableOption "spectrwm";
};
config = mkIf cfg.enable {
+1 -8
nixos/modules/services/x11/window-managers/stumpwm.nix
···
{
options = {
-
services.xserver.windowManager.stumpwm = {
-
enable = mkOption {
-
type = types.bool;
-
default = false;
-
example = true;
-
description = "Enable the stumpwm tiling window manager.";
-
};
-
};
+
services.xserver.windowManager.stumpwm.enable = mkEnableOption "stumpwm";
};
config = mkIf cfg.enable {
+1 -6
nixos/modules/services/x11/window-managers/twm.nix
···
###### interface
options = {
-
-
services.xserver.windowManager.twm.enable = mkOption {
-
default = false;
-
description = "Enable the twm window manager.";
-
};
-
+
services.xserver.windowManager.twm.enable = mkEnableOption "twm";
};
+1 -4
nixos/modules/services/x11/window-managers/windowmaker.nix
···
{
###### interface
options = {
-
services.xserver.windowManager.windowmaker.enable = mkOption {
-
default = false;
-
description = "Enable the Windowmaker window manager.";
-
};
+
services.xserver.windowManager.windowmaker.enable = mkEnableOption "windowmaker";
};
###### implementation
+1 -5
nixos/modules/services/x11/window-managers/wmii.nix
···
in
{
options = {
-
services.xserver.windowManager.wmii.enable = mkOption {
-
default = false;
-
example = true;
-
description = "Enable the wmii window manager.";
-
};
+
services.xserver.windowManager.wmii.enable = mkEnableOption "wmii";
};
config = mkIf cfg.enable {
+1 -6
nixos/modules/services/x11/window-managers/xmonad.nix
···
{
options = {
services.xserver.windowManager.xmonad = {
-
enable = mkOption {
-
default = false;
-
example = true;
-
description = "Enable the xmonad window manager.";
-
};
-
+
enable = mkEnableOption "xmonad";
haskellPackages = mkOption {
default = pkgs.haskellPackages;
defaultText = "pkgs.haskellPackages";