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.
This commit is contained in:
AndersonTorres 2015-12-04 07:38:23 -02:00
parent 12de4d5cb3
commit 2955b2fcf4
19 changed files with 19 additions and 105 deletions

View File

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

View File

@ -8,12 +8,7 @@ in
{
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 {

View File

@ -8,14 +8,7 @@ in
{
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 {

View File

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

View File

@ -8,11 +8,7 @@ in
{
###### 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 {

View File

@ -8,12 +8,7 @@ in
{
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 {

View File

@ -9,11 +9,7 @@ in
{
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;

View File

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

View File

@ -12,13 +12,7 @@ in
{
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 {

View File

@ -8,13 +8,7 @@ in
{
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 {

View File

@ -7,14 +7,7 @@ in
{
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 = {

View File

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

View File

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

View File

@ -9,13 +9,7 @@ in
{
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 {

View File

@ -8,14 +8,7 @@ in
{
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 {

View File

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

View File

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

View File

@ -7,11 +7,7 @@ let
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 {

View File

@ -13,12 +13,7 @@ in
{
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";