From 707e0099a16b57bbb1472a81004ddbde987e8950 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:31:54 +0000 Subject: [PATCH 001/115] krb5 module: use mkEnableOption --- nixos/modules/config/krb5.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/config/krb5.nix b/nixos/modules/config/krb5.nix index d318b7207429a..6510ed386121b 100644 --- a/nixos/modules/config/krb5.nix +++ b/nixos/modules/config/krb5.nix @@ -15,10 +15,7 @@ in krb5 = { - enable = mkOption { - default = false; - description = "Whether to enable Kerberos V."; - }; + enable = mkEnableOption "Kerberos V"; defaultRealm = mkOption { default = "ATENA.MIT.EDU"; From 7b128d33cf72999a306630b70fba72d188d30d54 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:32:09 +0000 Subject: [PATCH 002/115] pulseaudio module: use mkEnableOption --- nixos/modules/config/pulseaudio.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 06ce520042025..d9573ce1dcd5b 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -83,13 +83,7 @@ in { options = { hardware.pulseaudio = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the PulseAudio sound server. - ''; - }; + enable = mkEnableOption "the PulseAudio sound server"; systemWide = mkOption { type = types.bool; From a39469592ffab54cf63098f1e0cd6286422b2820 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:32:32 +0000 Subject: [PATCH 003/115] blcr module: use mkEnableOption import mkEnableOption --- nixos/modules/programs/blcr.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/modules/programs/blcr.nix b/nixos/modules/programs/blcr.nix index 804e1d01f12b8..4b348bc3276a9 100644 --- a/nixos/modules/programs/blcr.nix +++ b/nixos/modules/programs/blcr.nix @@ -1,7 +1,7 @@ { config, lib, ... }: let - inherit (lib) mkOption mkIf; + inherit (lib) mkEnableOption mkIf; cfg = config.environment.blcr; blcrPkg = config.boot.kernelPackages.blcr; in @@ -10,11 +10,7 @@ in ###### interface options = { - environment.blcr.enable = mkOption { - default = false; - description = - "Whether to enable support for the BLCR checkpointing tool."; - }; + environment.blcr.enable = mkEnableOption "support for the BLCR checkpointing tool"; }; ###### implementation From 680a5193e15d5e3cb552d51d4a38458ed65559f5 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:32:46 +0000 Subject: [PATCH 004/115] apparmor module: use mkEnableOption import mkEnableOption --- nixos/modules/security/apparmor.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index 202639f987012..6a7407c415fd4 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -1,18 +1,14 @@ { config, lib, pkgs, ... }: let - inherit (lib) mkIf mkOption types concatMapStrings; + inherit (lib) mkEnableOption mkIf mkOption types concatMapStrings; cfg = config.security.apparmor; in { options = { security.apparmor = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable the AppArmor Mandatory Access Control system."; - }; + enable = mkEnableOption "the AppArmor Mandatory Access Control system"; profiles = mkOption { type = types.listOf types.path; default = []; From 1d65fbf5c34a944c7a4a1b5e5f7611df886bde02 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:33:09 +0000 Subject: [PATCH 005/115] oath module: use mkEnableOption --- nixos/modules/security/oath.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/security/oath.nix b/nixos/modules/security/oath.nix index 20f3e2dd9f838..026868c3dc24f 100644 --- a/nixos/modules/security/oath.nix +++ b/nixos/modules/security/oath.nix @@ -8,13 +8,7 @@ with lib; options = { security.pam.oath = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable the OATH (one-time password) PAM module. - ''; - }; + enable = mkEnableOption "the OATH (one-time password) PAM module"; digits = mkOption { type = types.enum [ 6 7 8 ]; From b7d8fdab001bb75874983fd3004039709ef3ae8d Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:33:25 +0000 Subject: [PATCH 006/115] pam_mount module: use mkEnableOption --- nixos/modules/security/pam_mount.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix index a5299728348d6..fcc0726859fc9 100644 --- a/nixos/modules/security/pam_mount.nix +++ b/nixos/modules/security/pam_mount.nix @@ -12,13 +12,7 @@ in options = { security.pam.mount = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable PAM mount system to mount fileystems on user login. - ''; - }; + enable = mkEnableOption "PAM mount system to mount fileystems on user login"; extraVolumes = mkOption { type = types.listOf types.str; From 407be5bf49f871245f93c63f005878155231e096 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:33:35 +0000 Subject: [PATCH 007/115] default module: use mkEnableOption --- nixos/modules/services/amqp/activemq/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix index 261f976176644..e2834038984fc 100644 --- a/nixos/modules/services/amqp/activemq/default.nix +++ b/nixos/modules/services/amqp/activemq/default.nix @@ -24,13 +24,7 @@ in { options = { services.activemq = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable the Apache ActiveMQ message broker service. - ''; - }; + enable = mkEnableOption "the Apache ActiveMQ message broker service"; configurationDir = mkOption { default = "${activemq}/conf"; description = '' From 828460dab0945a97fe37d0044cd5de0f88f6d3ae Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:33:50 +0000 Subject: [PATCH 008/115] mpd module: use mkEnableOption --- nixos/modules/services/audio/mpd.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 85e0a7d2ac4ed..62093a4b49033 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -32,13 +32,7 @@ in { services.mpd = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable MPD, the music player daemon. - ''; - }; + enable = mkEnableOption "MPD, the music player daemon"; musicDirectory = mkOption { type = types.path; From e77fb1b42830c34c489f82ed1fd1a7894ae1cd3a Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:34:10 +0000 Subject: [PATCH 009/115] bacula module: use mkEnableOption --- nixos/modules/services/backup/bacula.nix | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index 8a26aae75fe96..5ee2f40641c7a 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -165,13 +165,7 @@ let in { options = { services.bacula-fd = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the Bacula File Daemon. - ''; - }; + enable = mkEnableOption "the Bacula File Daemon"; name = mkOption { default = "${config.networking.hostName}-fd"; @@ -225,13 +219,7 @@ in { }; services.bacula-sd = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable Bacula Storage Daemon. - ''; - }; + enable = mkEnableOption "Bacula Storage Daemon"; name = mkOption { default = "${config.networking.hostName}-sd"; @@ -290,13 +278,7 @@ in { }; services.bacula-dir = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable Bacula Director Daemon. - ''; - }; + enable = mkEnableOption "Bacula Director Daemon"; name = mkOption { default = "${config.networking.hostName}-dir"; From 80c590ddbb34433cc3de90d37ebc826c65d03838 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:34:12 +0000 Subject: [PATCH 010/115] mysql-backup module: use mkEnableOption --- nixos/modules/services/backup/mysql-backup.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index 28f607861f776..9835e372bc7fb 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -19,12 +19,7 @@ in services.mysqlBackup = { - enable = mkOption { - default = false; - description = '' - Whether to enable MySQL backups. - ''; - }; + enable = mkEnableOption "MySQL backups"; period = mkOption { default = "15 01 * * *"; From f22927398c150112e0296c6425b012f3de4a2be0 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:34:14 +0000 Subject: [PATCH 011/115] postgresql-backup module: use mkEnableOption --- nixos/modules/services/backup/postgresql-backup.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index 4a5ebebc682e1..481a58f99072c 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -20,12 +20,7 @@ in services.postgresqlBackup = { - enable = mkOption { - default = false; - description = '' - Whether to enable PostgreSQL dumps. - ''; - }; + enable = mkEnableOption "PostgreSQL dumps"; period = mkOption { default = "15 01 * * *"; From a01e25af2234f852b525721a5387c92ab4f699b8 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:34:16 +0000 Subject: [PATCH 012/115] fleet module: use mkEnableOption --- nixos/modules/services/cluster/fleet.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/cluster/fleet.nix b/nixos/modules/services/cluster/fleet.nix index 78d4ea93c491a..8eae4fb61dde9 100644 --- a/nixos/modules/services/cluster/fleet.nix +++ b/nixos/modules/services/cluster/fleet.nix @@ -9,13 +9,7 @@ in { ##### Interface options.services.fleet = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable fleet service. - ''; - }; + enable = mkEnableOption "fleet service"; listen = mkOption { type = types.listOf types.str; From 2f9adb668bc2ab3fdcb03e06f373abbb42df2ace Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:34:17 +0000 Subject: [PATCH 013/115] panamax module: use mkEnableOption --- nixos/modules/services/cluster/panamax.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/cluster/panamax.nix b/nixos/modules/services/cluster/panamax.nix index b47ff744fc27b..798e8ddca97ae 100644 --- a/nixos/modules/services/cluster/panamax.nix +++ b/nixos/modules/services/cluster/panamax.nix @@ -12,13 +12,7 @@ in { ##### Interface options.services.panamax = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable Panamax service. - ''; - }; + enable = mkEnableOption "Panamax service"; UIPort = mkOption { type = types.int; From e2c7dcbc3f3dd90145823d17167c6af9943b7dfe Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:34:19 +0000 Subject: [PATCH 014/115] default module: use mkEnableOption --- .../services/continuous-integration/jenkins/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 4edbbf59a42c5..11ccaa32dab5f 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -5,13 +5,7 @@ let in { options = { services.jenkins = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the jenkins continuous integration server. - ''; - }; + enable = mkEnableOption "the jenkins continuous integration server"; user = mkOption { default = "jenkins"; From 668c4d3886ae4e13e94c01e1377d21c42c31a1b9 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:34:27 +0000 Subject: [PATCH 015/115] 4store-endpoint module: use mkEnableOption --- nixos/modules/services/databases/4store-endpoint.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix index 906cb320df983..4976696ecbfdd 100644 --- a/nixos/modules/services/databases/4store-endpoint.nix +++ b/nixos/modules/services/databases/4store-endpoint.nix @@ -13,10 +13,7 @@ with lib; services.fourStoreEndpoint = { - enable = mkOption { - default = false; - description = "Whether to enable 4Store SPARQL endpoint."; - }; + enable = mkEnableOption "4Store SPARQL endpoint"; database = mkOption { default = config.services.fourStore.database; From 15441f4fbcebdf3661148a286f3637cb20e2719c Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:34:28 +0000 Subject: [PATCH 016/115] 4store module: use mkEnableOption --- nixos/modules/services/databases/4store.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/services/databases/4store.nix b/nixos/modules/services/databases/4store.nix index 62856822f906e..0042129b81f30 100644 --- a/nixos/modules/services/databases/4store.nix +++ b/nixos/modules/services/databases/4store.nix @@ -14,10 +14,7 @@ with lib; services.fourStore = { - enable = mkOption { - default = false; - description = "Whether to enable 4Store RDF database server."; - }; + enable = mkEnableOption "4Store RDF database server"; database = mkOption { default = ""; From e7a54b6484ac449b69f8d5f434849cd76f702352 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:34:31 +0000 Subject: [PATCH 017/115] firebird module: use mkEnableOption --- nixos/modules/services/databases/firebird.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index b9f66612d4ebf..d8bbee308a23a 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -40,12 +40,7 @@ in services.firebird = { - enable = mkOption { - default = false; - description = '' - Whether to enable the Firebird super server. - ''; - }; + enable = mkEnableOption "the Firebird super server"; package = mkOption { default = pkgs.firebirdSuper; From f5785463f7fba17225462b23aeb87a3a88ee84b4 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:34:32 +0000 Subject: [PATCH 018/115] memcached module: use mkEnableOption --- nixos/modules/services/databases/memcached.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix index c6875af506d35..702f8a086f461 100644 --- a/nixos/modules/services/databases/memcached.nix +++ b/nixos/modules/services/databases/memcached.nix @@ -18,12 +18,7 @@ in services.memcached = { - enable = mkOption { - default = false; - description = " - Whether to enable Memcached. - "; - }; + enable = mkEnableOption "Memcached"; user = mkOption { default = "memcached"; From 6c0e819271a9602cf1357c8cbb7174581d6b625c Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:34:35 +0000 Subject: [PATCH 019/115] monetdb module: use mkEnableOption --- nixos/modules/services/databases/monetdb.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/databases/monetdb.nix b/nixos/modules/services/databases/monetdb.nix index 9f09c71e005ad..8dda02b8f2a3a 100644 --- a/nixos/modules/services/databases/monetdb.nix +++ b/nixos/modules/services/databases/monetdb.nix @@ -12,11 +12,7 @@ with lib; services.monetdb = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable MonetDB database server."; - }; + enable = mkEnableOption "MonetDB database server"; package = mkOption { type = types.path; From dda39570080e712912f5ad13cd4982d8f091a996 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:34:38 +0000 Subject: [PATCH 020/115] mongodb module: use mkEnableOption --- nixos/modules/services/databases/mongodb.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index ef9bc46e4a0ee..a5dfebc856a23 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -32,12 +32,7 @@ in services.mongodb = { - enable = mkOption { - default = false; - description = " - Whether to enable the MongoDB server. - "; - }; + enable = mkEnableOption "the MongoDB server"; package = mkOption { default = pkgs.mongodb; From 976d750cad605af3b874fad8598999b302463919 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:34:38 +0000 Subject: [PATCH 021/115] mysql module: use mkEnableOption --- nixos/modules/services/databases/mysql.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 0b2f99f8fff11..349943a3d4efc 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -42,12 +42,7 @@ in services.mysql = { - enable = mkOption { - default = false; - description = " - Whether to enable the MySQL server. - "; - }; + enable = mkEnableOption "the MySQL server"; package = mkOption { type = types.package; From 25349cf8d6ab46d79e6b74b932358ce581d436ab Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:34:43 +0000 Subject: [PATCH 022/115] neo4j module: use mkEnableOption --- nixos/modules/services/databases/neo4j.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index 41b9606859063..3eedda5bf746e 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -40,11 +40,7 @@ in { ###### interface options.services.neo4j = { - enable = mkOption { - description = "Whether to enable neo4j."; - default = false; - type = types.bool; - }; + enable = mkEnableOption "neo4j"; package = mkOption { description = "Neo4j package to use."; From cb5129d5194eca37ff64569bf822a42f77dad54c Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:34:48 +0000 Subject: [PATCH 023/115] openldap module: use mkEnableOption --- nixos/modules/services/databases/openldap.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 9f22aa7c92b29..d45f6a5af55a3 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -19,14 +19,7 @@ in services.openldap = { - enable = mkOption { - type = types.bool; - default = false; - description = " - Whether to enable the ldap server. - "; - example = true; - }; + enable = mkEnableOption "the ldap server"; user = mkOption { type = types.string; From d0dfda01316d16e6ce0e3f269c42f00770cfbcd7 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:34:50 +0000 Subject: [PATCH 024/115] virtuoso module: use mkEnableOption --- nixos/modules/services/databases/virtuoso.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/services/databases/virtuoso.nix b/nixos/modules/services/databases/virtuoso.nix index 3231fede08fa5..f080ba0b76774 100644 --- a/nixos/modules/services/databases/virtuoso.nix +++ b/nixos/modules/services/databases/virtuoso.nix @@ -13,10 +13,7 @@ with lib; services.virtuoso = { - enable = mkOption { - default = false; - description = "Whether to enable Virtuoso Opensource database server."; - }; + enable = mkEnableOption "Virtuoso Opensource database server"; config = mkOption { default = ""; From 6bdf6e75b31fef06a11f527bdd95d03268454404 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:34:55 +0000 Subject: [PATCH 025/115] seahorse module: use mkEnableOption --- nixos/modules/services/desktops/gnome3/seahorse.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/desktops/gnome3/seahorse.nix b/nixos/modules/services/desktops/gnome3/seahorse.nix index 45925aaca9b94..5769458c840e9 100644 --- a/nixos/modules/services/desktops/gnome3/seahorse.nix +++ b/nixos/modules/services/desktops/gnome3/seahorse.nix @@ -15,13 +15,7 @@ in services.gnome3.seahorse = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable Seahorse search provider for the GNOME Shell activity search. - ''; - }; + enable = mkEnableOption "Seahorse search provider for the GNOME Shell activity search"; }; From 9109948363c530d98bcbf1e3d2cd58114c557703 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:34:57 +0000 Subject: [PATCH 026/115] sushi module: use mkEnableOption --- nixos/modules/services/desktops/gnome3/sushi.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/desktops/gnome3/sushi.nix b/nixos/modules/services/desktops/gnome3/sushi.nix index ff7f484602c78..80d7440e87db6 100644 --- a/nixos/modules/services/desktops/gnome3/sushi.nix +++ b/nixos/modules/services/desktops/gnome3/sushi.nix @@ -15,13 +15,7 @@ in services.gnome3.sushi = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable Sushi, a quick previewer for nautilus. - ''; - }; + enable = mkEnableOption "Sushi, a quick previewer for nautilus"; }; From 2e0925f2df28546e811250bb9ac6bf1a8305cd8c Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:35:00 +0000 Subject: [PATCH 027/115] profile-sync-daemon module: use mkEnableOption --- nixos/modules/services/desktops/profile-sync-daemon.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/desktops/profile-sync-daemon.nix b/nixos/modules/services/desktops/profile-sync-daemon.nix index d66ecef2385a0..f8ec6607e8448 100644 --- a/nixos/modules/services/desktops/profile-sync-daemon.nix +++ b/nixos/modules/services/desktops/profile-sync-daemon.nix @@ -21,13 +21,7 @@ let in { options.services.psd = with types; { - enable = mkOption { - type = bool; - default = false; - description = '' - Whether to enable the Profile Sync daemon. - ''; - }; + enable = mkEnableOption "the Profile Sync daemon"; users = mkOption { type = listOf str; From 1d00689cdb08a4bd0cf9aecd36f86d0e94a5815f Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:35:08 +0000 Subject: [PATCH 028/115] ghost-one module: use mkEnableOption --- nixos/modules/services/games/ghost-one.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/services/games/ghost-one.nix b/nixos/modules/services/games/ghost-one.nix index 5762148df2bb1..42fc60dea08ee 100644 --- a/nixos/modules/services/games/ghost-one.nix +++ b/nixos/modules/services/games/ghost-one.nix @@ -14,10 +14,7 @@ in options = { services.ghostOne = { - enable = mkOption { - default = false; - description = "Enable Ghost-One Warcraft3 game hosting server."; - }; + enable = mkEnableOption "Ghost-One Warcraft3 game hosting server"; language = mkOption { default = "English"; From 1b71fd719015499c53335358067d42dedad2cbfe Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:35:10 +0000 Subject: [PATCH 029/115] acpid module: use mkEnableOption --- nixos/modules/services/hardware/acpid.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix index bb17c8859d842..c26f35e9d7acd 100644 --- a/nixos/modules/services/hardware/acpid.nix +++ b/nixos/modules/services/hardware/acpid.nix @@ -47,11 +47,7 @@ in services.acpid = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the ACPI daemon."; - }; + enable = mkEnableOption "the ACPI daemon"; handlers = mkOption { type = types.attrsOf (types.submodule { From 9464f99bf773869e1ce0fc636610395005ee9992 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:35:20 +0000 Subject: [PATCH 030/115] bluetooth module: use mkEnableOption --- nixos/modules/services/hardware/bluetooth.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index 2c271b3281794..a5123674a36bd 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -45,11 +45,7 @@ in options = { - hardware.bluetooth.enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable support for Bluetooth."; - }; + hardware.bluetooth.enable = mkEnableOption "support for Bluetooth"; }; From f5ca063512560196d222846e49d9b5368ef5809e Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:35:23 +0000 Subject: [PATCH 031/115] brltty module: use mkEnableOption --- nixos/modules/services/hardware/brltty.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/hardware/brltty.nix b/nixos/modules/services/hardware/brltty.nix index 03e530b2c96d1..4cd30f8d5ea70 100644 --- a/nixos/modules/services/hardware/brltty.nix +++ b/nixos/modules/services/hardware/brltty.nix @@ -9,11 +9,7 @@ in { options = { - services.brltty.enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the BRLTTY daemon."; - }; + services.brltty.enable = mkEnableOption "the BRLTTY daemon"; }; From 8c9f4555624fde2cd1dc73456966594854c11638 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:35:58 +0000 Subject: [PATCH 032/115] thermald module: use mkEnableOption --- nixos/modules/services/hardware/thermald.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/hardware/thermald.nix b/nixos/modules/services/hardware/thermald.nix index 88c3f99aed4e0..4d1b3eef6fdc4 100644 --- a/nixos/modules/services/hardware/thermald.nix +++ b/nixos/modules/services/hardware/thermald.nix @@ -8,12 +8,7 @@ in { ###### interface options = { services.thermald = { - enable = mkOption { - default = false; - description = '' - Whether to enable thermald, the temperature management daemon. - ''; - }; + enable = mkEnableOption "thermald, the temperature management daemon"; }; }; From e4d387b4c2c91546f54a8c397b416616ff293a05 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:36:03 +0000 Subject: [PATCH 033/115] thinkfan module: use mkEnableOption --- nixos/modules/services/hardware/thinkfan.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix index 018e82e58a3de..f845efe205750 100644 --- a/nixos/modules/services/hardware/thinkfan.nix +++ b/nixos/modules/services/hardware/thinkfan.nix @@ -52,12 +52,7 @@ in { services.thinkfan = { - enable = mkOption { - default = false; - description = '' - Whether to enable thinkfan, fan controller for ibm/lenovo thinkpads. - ''; - }; + enable = mkEnableOption "thinkfan, fan controller for ibm/lenovo thinkpads"; sensor = mkOption { default = "/proc/acpi/ibm/thermal"; From 47f718421acff0852f79aa4e69b3f87fa1bd7561 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:36:05 +0000 Subject: [PATCH 034/115] tlp module: use mkEnableOption --- nixos/modules/services/hardware/tlp.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix index 281d02a8c65e3..158d942301dee 100644 --- a/nixos/modules/services/hardware/tlp.nix +++ b/nixos/modules/services/hardware/tlp.nix @@ -33,11 +33,7 @@ in services.tlp = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the TLP daemon."; - }; + enable = mkEnableOption "the TLP daemon"; extraConfig = mkOption { type = types.str; From 0fcea0693eb4d9d9e9596e1701dda011f3915ba8 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:36:13 +0000 Subject: [PATCH 035/115] fluentd module: use mkEnableOption --- nixos/modules/services/logging/fluentd.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/logging/fluentd.nix b/nixos/modules/services/logging/fluentd.nix index 3aa27a1526695..247776ea077f2 100644 --- a/nixos/modules/services/logging/fluentd.nix +++ b/nixos/modules/services/logging/fluentd.nix @@ -10,11 +10,7 @@ in { options = { services.fluentd = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable fluentd."; - }; + enable = mkEnableOption "fluentd"; config = mkOption { type = types.lines; From ed5ccd45b451a584463221e5d11dc5517174bc86 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:36:15 +0000 Subject: [PATCH 036/115] logcheck module: use mkEnableOption --- nixos/modules/services/logging/logcheck.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index 3a85fa60fe7a6..7ccda55d60e8f 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -105,13 +105,7 @@ in { options = { services.logcheck = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Enable the logcheck cron job. - ''; - }; + enable = mkEnableOption "the logcheck cron job"; user = mkOption { default = "logcheck"; From 116a683b2ff8eafeec3482d32a4b8d1e72744b42 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:36:16 +0000 Subject: [PATCH 037/115] logstash module: use mkEnableOption --- nixos/modules/services/logging/logstash.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index 62f6e187ea079..5623616dbbcd1 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -24,11 +24,7 @@ in services.logstash = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable logstash."; - }; + enable = mkEnableOption "logstash"; package = mkOption { type = types.package; From 0c68d0efbd74a8dca58261bb726a256e97dda540 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:36:25 +0000 Subject: [PATCH 038/115] syslog-ng module: use mkEnableOption --- nixos/modules/services/logging/syslog-ng.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix index 21be286a6e985..984064278af63 100644 --- a/nixos/modules/services/logging/syslog-ng.nix +++ b/nixos/modules/services/logging/syslog-ng.nix @@ -29,13 +29,7 @@ in { options = { services.syslog-ng = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the syslog-ng daemon. - ''; - }; + enable = mkEnableOption "the syslog-ng daemon"; package = mkOption { type = types.package; default = pkgs.syslogng; From aaee89acd216449458f506b091fadbdc0dfe2008 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:36:30 +0000 Subject: [PATCH 039/115] dspam module: use mkEnableOption --- nixos/modules/services/mail/dspam.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/mail/dspam.nix b/nixos/modules/services/mail/dspam.nix index 89076ff054620..7e13e97131122 100644 --- a/nixos/modules/services/mail/dspam.nix +++ b/nixos/modules/services/mail/dspam.nix @@ -35,11 +35,7 @@ in { services.dspam = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the dspam spam filter."; - }; + enable = mkEnableOption "the dspam spam filter"; user = mkOption { type = types.str; From 64d3dc61aa16e478f561b6ebb1a5a7d1226a0c27 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:36:35 +0000 Subject: [PATCH 040/115] exim module: use mkEnableOption import mkEnableOption --- nixos/modules/services/mail/exim.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix index e0890d96a88bb..ff2bf50e33789 100644 --- a/nixos/modules/services/mail/exim.nix +++ b/nixos/modules/services/mail/exim.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let - inherit (lib) mkIf mkOption singleton types; + inherit (lib) mkEnableOption mkIf mkOption singleton types; inherit (pkgs) coreutils exim; cfg = config.services.exim; in @@ -14,11 +14,7 @@ in services.exim = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the Exim mail transfer agent."; - }; + enable = mkEnableOption "the Exim mail transfer agent"; config = mkOption { type = types.string; From 28fe6260966db506e735c40c06ad1e2bb4a9c775 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:36:38 +0000 Subject: [PATCH 041/115] opendkim module: use mkEnableOption --- nixos/modules/services/mail/opendkim.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix index f065208ddfc15..1896171f481f3 100644 --- a/nixos/modules/services/mail/opendkim.nix +++ b/nixos/modules/services/mail/opendkim.nix @@ -23,11 +23,7 @@ in { services.opendkim = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the OpenDKIM sender authentication system."; - }; + enable = mkEnableOption "the OpenDKIM sender authentication system"; socket = mkOption { type = types.str; From daadbc821878055d4ecafa1cf612b19eabb421ad Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:36:40 +0000 Subject: [PATCH 042/115] postsrsd module: use mkEnableOption --- nixos/modules/services/mail/postsrsd.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix index 68a4c10120645..54945baf26225 100644 --- a/nixos/modules/services/mail/postsrsd.nix +++ b/nixos/modules/services/mail/postsrsd.nix @@ -14,11 +14,7 @@ in { services.postsrsd = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the postsrsd SRS server for Postfix."; - }; + enable = mkEnableOption "the postsrsd SRS server for Postfix"; domain = mkOption { type = types.str; From f6b6b30d32eaff9f5da814a3fa6843501b599e8b Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:36:44 +0000 Subject: [PATCH 043/115] apache-kafka module: use mkEnableOption --- nixos/modules/services/misc/apache-kafka.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix index 88ce8b5a23fc7..2354e75c4519a 100644 --- a/nixos/modules/services/misc/apache-kafka.nix +++ b/nixos/modules/services/misc/apache-kafka.nix @@ -30,11 +30,7 @@ let in { options.services.apache-kafka = { - enable = mkOption { - description = "Whether to enable Apache Kafka."; - default = false; - type = types.bool; - }; + enable = mkEnableOption "Apache Kafka"; brokerId = mkOption { description = "Broker ID."; From 004555f5cac9b0093a9e4055d952002650a13956 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:36:46 +0000 Subject: [PATCH 044/115] canto-daemon module: use mkEnableOption --- nixos/modules/services/misc/canto-daemon.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/canto-daemon.nix b/nixos/modules/services/misc/canto-daemon.nix index db51a263aab53..179eeaf8af52c 100644 --- a/nixos/modules/services/misc/canto-daemon.nix +++ b/nixos/modules/services/misc/canto-daemon.nix @@ -13,11 +13,7 @@ in { options = { services.canto-daemon = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the canto RSS daemon."; - }; + enable = mkEnableOption "the canto RSS daemon"; }; }; From 282b3a1f4cc6564627545c18956252b741f2f1c9 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:36:48 +0000 Subject: [PATCH 045/115] cpuminer-cryptonight module: use mkEnableOption --- nixos/modules/services/misc/cpuminer-cryptonight.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/misc/cpuminer-cryptonight.nix b/nixos/modules/services/misc/cpuminer-cryptonight.nix index f31526f8d1078..8bafc7d58c4d6 100644 --- a/nixos/modules/services/misc/cpuminer-cryptonight.nix +++ b/nixos/modules/services/misc/cpuminer-cryptonight.nix @@ -20,13 +20,7 @@ in options = { services.cpuminer-cryptonight = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the cpuminer cryptonight miner. - ''; - }; + enable = mkEnableOption "the cpuminer cryptonight miner"; url = mkOption { type = types.string; description = "URL of mining server"; From b33d8b8bfd08ae6c61665bb8080e2b26df08541e Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:36:50 +0000 Subject: [PATCH 046/115] devmon module: use mkEnableOption --- nixos/modules/services/misc/devmon.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/misc/devmon.nix b/nixos/modules/services/misc/devmon.nix index 9dc8fee2964b1..e4a3348646b1d 100644 --- a/nixos/modules/services/misc/devmon.nix +++ b/nixos/modules/services/misc/devmon.nix @@ -8,12 +8,7 @@ let in { options = { services.devmon = { - enable = mkOption { - default = false; - description = '' - Whether to enable devmon, an automatic device mounting daemon. - ''; - }; + enable = mkEnableOption "devmon, an automatic device mounting daemon"; }; }; From c7cdd5dcbed9ab39a94c771404d283c686c778fa Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:37:01 +0000 Subject: [PATCH 047/115] etcd module: use mkEnableOption --- nixos/modules/services/misc/etcd.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index d30cc5fd7e890..c00a49b7a5adb 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -8,11 +8,7 @@ let in { options.services.etcd = { - enable = mkOption { - description = "Whether to enable etcd."; - default = false; - type = types.bool; - }; + enable = mkEnableOption "etcd"; name = mkOption { description = "Etcd unique node name."; From 3d5bcdeb564e2cb4017a7d76ea8a8ac86ae45b81 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:37:03 +0000 Subject: [PATCH 048/115] folding-at-home module: use mkEnableOption --- nixos/modules/services/misc/folding-at-home.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/misc/folding-at-home.nix b/nixos/modules/services/misc/folding-at-home.nix index 4f09cbfdd79b4..9d07c9e2625ff 100644 --- a/nixos/modules/services/misc/folding-at-home.nix +++ b/nixos/modules/services/misc/folding-at-home.nix @@ -12,12 +12,7 @@ in { services.foldingAtHome = { - enable = mkOption { - default = false; - description = '' - Whether to enable the Folding@Home to use idle CPU time. - ''; - }; + enable = mkEnableOption "the Folding@Home to use idle CPU time"; nickname = mkOption { default = "Anonymous"; From 21216118ef951284c4e9c012947b8172a0d7535a Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:37:07 +0000 Subject: [PATCH 049/115] mbpfan module: use mkEnableOption --- nixos/modules/services/misc/mbpfan.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix index 972d8b572d369..ad33260fd3b14 100644 --- a/nixos/modules/services/misc/mbpfan.nix +++ b/nixos/modules/services/misc/mbpfan.nix @@ -8,13 +8,7 @@ let in { options.services.mbpfan = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Whether to enable the mbpfan daemon. - ''; - }; + enable = mkEnableOption "the mbpfan daemon"; package = mkOption { type = types.package; From 9bbe99446bcbe556e012d29c1315f866e6e49a50 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:37:08 +0000 Subject: [PATCH 050/115] mediatomb module: use mkEnableOption --- nixos/modules/services/misc/mediatomb.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index 40ec2831ff09d..0a9d9278241e7 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -155,13 +155,7 @@ in { services.mediatomb = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the mediatomb DLNA server. - ''; - }; + enable = mkEnableOption "the mediatomb DLNA server"; serverName = mkOption { type = types.string; From c673ea18d0b2def306f556b86d5d2e218d2536e1 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:37:10 +0000 Subject: [PATCH 051/115] mesos-master module: use mkEnableOption --- nixos/modules/services/misc/mesos-master.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/mesos-master.nix b/nixos/modules/services/misc/mesos-master.nix index 497646b2b4187..6f2be82b17058 100644 --- a/nixos/modules/services/misc/mesos-master.nix +++ b/nixos/modules/services/misc/mesos-master.nix @@ -10,11 +10,7 @@ in { options.services.mesos = { master = { - enable = mkOption { - description = "Whether to enable the Mesos Master."; - default = false; - type = types.bool; - }; + enable = mkEnableOption "the Mesos Master"; port = mkOption { description = "Mesos Master port"; From 64884ce5e717d5e62d2eb79ec1c473e05641fc61 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:37:11 +0000 Subject: [PATCH 052/115] mesos-slave module: use mkEnableOption --- nixos/modules/services/misc/mesos-slave.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix index 8c29734813a13..6deff4961402d 100644 --- a/nixos/modules/services/misc/mesos-slave.nix +++ b/nixos/modules/services/misc/mesos-slave.nix @@ -18,11 +18,7 @@ in { options.services.mesos = { slave = { - enable = mkOption { - description = "Whether to enable the Mesos Slave."; - default = false; - type = types.bool; - }; + enable = mkEnableOption "the Mesos Slave"; ip = mkOption { description = "IP address to listen on."; From a42fa610134016f69c10026f14759c7a9ac5f2ad Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:37:18 +0000 Subject: [PATCH 053/115] nix-ssh-serve module: use mkEnableOption --- nixos/modules/services/misc/nix-ssh-serve.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix index 66148431709fc..f9982d5f2e9fe 100644 --- a/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/nixos/modules/services/misc/nix-ssh-serve.nix @@ -7,11 +7,7 @@ with lib; nix.sshServe = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable serving the Nix store as a binary cache via SSH."; - }; + enable = mkEnableOption "serving the Nix store as a binary cache via SSH"; keys = mkOption { type = types.listOf types.str; From 471117984915e9df47a89905c82bd90b970d9e78 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:37:20 +0000 Subject: [PATCH 054/115] phd module: use mkEnableOption --- nixos/modules/services/misc/phd.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/misc/phd.nix b/nixos/modules/services/misc/phd.nix index e605ce5de16e2..8e46335200755 100644 --- a/nixos/modules/services/misc/phd.nix +++ b/nixos/modules/services/misc/phd.nix @@ -16,12 +16,7 @@ in services.phd = { - enable = mkOption { - default = false; - description = " - Enable daemons for phabricator. - "; - }; + enable = mkEnableOption "daemons for phabricator"; }; From 38f1dd665e86577082b764e904dc55c5449b56ff Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:37:22 +0000 Subject: [PATCH 055/115] redmine module: use mkEnableOption --- nixos/modules/services/misc/redmine.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 7c9483911f21f..b6dd36e14b0dc 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -56,13 +56,7 @@ in { options = { services.redmine = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable the redmine service. - ''; - }; + enable = mkEnableOption "the redmine service"; stateDir = mkOption { type = types.str; From e94f42fad12f40e0774700383592ff44d2c6e452 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:37:28 +0000 Subject: [PATCH 056/115] svnserve module: use mkEnableOption --- nixos/modules/services/misc/svnserve.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix index c74befac749db..fd6c4bf8c7737 100644 --- a/nixos/modules/services/misc/svnserve.nix +++ b/nixos/modules/services/misc/svnserve.nix @@ -17,10 +17,7 @@ in services.svnserve = { - enable = mkOption { - default = false; - description = "Whether to enable svnserve to serve Subversion repositories through the SVN protocol."; - }; + enable = mkEnableOption "svnserve to serve Subversion repositories through the SVN protocol"; svnBaseDir = mkOption { default = "/repos"; From d2e9f9dd450afb2c7971e26ec33c34f4d57cd635 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:37:50 +0000 Subject: [PATCH 057/115] cadvisor module: use mkEnableOption --- nixos/modules/services/monitoring/cadvisor.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index a67df158be478..bd2adf459d223 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -8,11 +8,7 @@ let in { options = { services.cadvisor = { - enable = mkOption { - default = false; - type = types.bool; - description = "Whether to enable cadvisor service."; - }; + enable = mkEnableOption "cadvisor service"; listenAddress = mkOption { default = "127.0.0.1"; From 7b49fd96b6eb1ed0724055c759f6fa898f5a296e Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:37:54 +0000 Subject: [PATCH 058/115] collectd module: use mkEnableOption --- nixos/modules/services/monitoring/collectd.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix index 3c3d83c66ed00..f28fde0001f8a 100644 --- a/nixos/modules/services/monitoring/collectd.nix +++ b/nixos/modules/services/monitoring/collectd.nix @@ -26,13 +26,7 @@ let in { options.services.collectd = with types; { - enable = mkOption { - default = false; - description = '' - Whether to enable collectd agent. - ''; - type = bool; - }; + enable = mkEnableOption "collectd agent"; package = mkOption { default = pkgs.collectd; From ede75e432a9bc5a7df1d0f4232e2821991a9f514 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:38:08 +0000 Subject: [PATCH 059/115] default module: use mkEnableOption --- nixos/modules/services/monitoring/prometheus/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 31979d2660cc0..287ea5b2b11d4 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -322,13 +322,7 @@ in { options = { services.prometheus = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable the Prometheus monitoring daemon. - ''; - }; + enable = mkEnableOption "the Prometheus monitoring daemon"; listenAddress = mkOption { type = types.str; From 01597401fe43af5b97fea5e3ddeb31030963f20d Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:38:13 +0000 Subject: [PATCH 060/115] riemann-dash module: use mkEnableOption --- nixos/modules/services/monitoring/riemann-dash.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/monitoring/riemann-dash.nix b/nixos/modules/services/monitoring/riemann-dash.nix index 523f74cb72b97..db43592259b80 100644 --- a/nixos/modules/services/monitoring/riemann-dash.nix +++ b/nixos/modules/services/monitoring/riemann-dash.nix @@ -23,13 +23,7 @@ in { options = { services.riemann-dash = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable the riemann-dash dashboard daemon. - ''; - }; + enable = mkEnableOption "the riemann-dash dashboard daemon"; config = mkOption { type = types.lines; description = '' From e575fb39131848decf40139eda76b6aa557fd86d Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:38:16 +0000 Subject: [PATCH 061/115] riemann module: use mkEnableOption --- nixos/modules/services/monitoring/riemann.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/monitoring/riemann.nix b/nixos/modules/services/monitoring/riemann.nix index ac5d0134a80d6..29b997580e948 100644 --- a/nixos/modules/services/monitoring/riemann.nix +++ b/nixos/modules/services/monitoring/riemann.nix @@ -27,13 +27,7 @@ in { options = { services.riemann = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable the Riemann network monitoring daemon. - ''; - }; + enable = mkEnableOption "the Riemann network monitoring daemon"; config = mkOption { type = types.lines; description = '' From 53090baaebde149b42301f890a975e1d14165dc8 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:38:20 +0000 Subject: [PATCH 062/115] sysstat module: use mkEnableOption --- nixos/modules/services/monitoring/sysstat.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/monitoring/sysstat.nix b/nixos/modules/services/monitoring/sysstat.nix index d668faa53cc33..a57a194d0bfa2 100644 --- a/nixos/modules/services/monitoring/sysstat.nix +++ b/nixos/modules/services/monitoring/sysstat.nix @@ -5,13 +5,7 @@ let in { options = { services.sysstat = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable sar system activity collection. - ''; - }; + enable = mkEnableOption "sar system activity collection"; collect-frequency = mkOption { default = "*:00/10"; From f6f34fc0d06b0a9996bc2b587bca25f0afc21a32 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:38:24 +0000 Subject: [PATCH 063/115] systemhealth module: use mkEnableOption --- nixos/modules/services/monitoring/systemhealth.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/monitoring/systemhealth.nix b/nixos/modules/services/monitoring/systemhealth.nix index 20d1dadd3bf2a..b1e87ad1b7479 100644 --- a/nixos/modules/services/monitoring/systemhealth.nix +++ b/nixos/modules/services/monitoring/systemhealth.nix @@ -42,12 +42,7 @@ in { options = { services.systemhealth = { - enable = mkOption { - default = false; - description = '' - Enable the system health monitor and its generation of graphs. - ''; - }; + enable = mkEnableOption "the system health monitor and its generation of graphs"; urlPrefix = mkOption { default = "/health"; From ca2ed378e85919fb54af481a00cd2c1de262cf0c Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:38:49 +0000 Subject: [PATCH 064/115] netatalk module: use mkEnableOption --- .../modules/services/network-filesystems/netatalk.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/network-filesystems/netatalk.nix b/nixos/modules/services/network-filesystems/netatalk.nix index bff54406a2b0a..250d68d494206 100644 --- a/nixos/modules/services/network-filesystems/netatalk.nix +++ b/nixos/modules/services/network-filesystems/netatalk.nix @@ -43,10 +43,7 @@ in options = { services.netatalk = { - enable = mkOption { - default = false; - description = "Whether to enable the Netatalk AFP fileserver."; - }; + enable = mkEnableOption "the Netatalk AFP fileserver"; port = mkOption { default = 548; @@ -64,10 +61,7 @@ in }; homes = { - enable = mkOption { - default = false; - description = "Enable sharing of the UNIX server user home directories."; - }; + enable = mkEnableOption "sharing of the UNIX server user home directories"; path = mkOption { default = ""; From 346af8dce322da5c1e4d3fe579b78a507d1782ac Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:39:11 +0000 Subject: [PATCH 065/115] nfsd module: use mkEnableOption --- nixos/modules/services/network-filesystems/nfsd.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix index ddc7258ce0b44..7d419e3785375 100644 --- a/nixos/modules/services/network-filesystems/nfsd.nix +++ b/nixos/modules/services/network-filesystems/nfsd.nix @@ -19,12 +19,7 @@ in services.nfs = { server = { - enable = mkOption { - default = false; - description = '' - Whether to enable the kernel's NFS server. - ''; - }; + enable = mkEnableOption "the kernel's NFS server"; exports = mkOption { default = ""; From 16bf58473d4bc10d6f8898267a9d19cb030dd933 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:39:13 +0000 Subject: [PATCH 066/115] openafs module: use mkEnableOption import mkenableoption --- .../network-filesystems/openafs-client/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix index 891f41c8dcdc3..e56f888804704 100644 --- a/nixos/modules/services/network-filesystems/openafs-client/default.nix +++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: let - inherit (lib) mkOption mkIf; + inherit (lib) mkEnableOption mkOption mkIf; cfg = config.services.openafsClient; @@ -26,10 +26,7 @@ in services.openafsClient = { - enable = mkOption { - default = false; - description = "Whether to enable the OpenAFS client."; - }; + enable = mkEnableOption "the OpenAFS client"; cellName = mkOption { default = "grand.central.org"; From a2cb867b0750ac8b8fc835c74ce410de42e607c2 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:39:15 +0000 Subject: [PATCH 067/115] rsyncd module: use mkEnableOption --- nixos/modules/services/network-filesystems/rsyncd.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index 2018bfa14a576..47a8afc2e3bcc 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -30,10 +30,7 @@ in options = { services.rsyncd = { - enable = mkOption { - default = false; - description = "Whether to enable the rsync daemon."; - }; + enable = mkEnableOption "the rsync daemon"; motd = mkOption { type = types.string; From cc754d84da110a45ae8bf7d7bb4fdf5a0ff79abb Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:39:40 +0000 Subject: [PATCH 068/115] asterisk module: use mkEnableOption --- nixos/modules/services/networking/asterisk.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix index 13617a1b6c58d..c48631025c876 100644 --- a/nixos/modules/services/networking/asterisk.nix +++ b/nixos/modules/services/networking/asterisk.nix @@ -81,13 +81,7 @@ in { options = { services.asterisk = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the Asterisk PBX server. - ''; - }; + enable = mkEnableOption "the Asterisk PBX server"; extraConfig = mkOption { default = ""; From 20616e3ab7acae1240f3cee411352af47ffcc686 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:39:41 +0000 Subject: [PATCH 069/115] atftpd module: use mkEnableOption --- nixos/modules/services/networking/atftpd.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/networking/atftpd.nix b/nixos/modules/services/networking/atftpd.nix index d875ddc635280..1b269c35cbd59 100644 --- a/nixos/modules/services/networking/atftpd.nix +++ b/nixos/modules/services/networking/atftpd.nix @@ -16,13 +16,7 @@ in services.atftpd = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Whenever to enable the atftpd TFTP server. - ''; - }; + enable = mkEnableOption "the atftpd TFTP server"; root = mkOption { default = "/var/empty"; From be3c56721086549775a43e2d1eccebb695763d84 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:39:44 +0000 Subject: [PATCH 070/115] bind module: use mkEnableOption --- nixos/modules/services/networking/bind.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 08afafceff24d..572fe991d22e6 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -61,12 +61,7 @@ in services.bind = { - enable = mkOption { - default = false; - description = " - Whether to enable BIND domain name server. - "; - }; + enable = mkEnableOption "BIND domain name server"; cacheNetworks = mkOption { default = ["127.0.0.0/24"]; From ac9434219c7e0493c5db541bc0c7134af0fbb66e Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:39:48 +0000 Subject: [PATCH 071/115] cntlm module: use mkEnableOption --- nixos/modules/services/networking/cntlm.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix index 76c0fd7d0ea3e..12253a13698bd 100644 --- a/nixos/modules/services/networking/cntlm.nix +++ b/nixos/modules/services/networking/cntlm.nix @@ -15,12 +15,7 @@ in services.cntlm = { - enable = mkOption { - default = false; - description = '' - Whether to enable the cntlm, which start a local proxy. - ''; - }; + enable = mkEnableOption "the cntlm, which start a local proxy"; username = mkOption { description = '' From a6d7ed7d3e67ede13739358e781678684c80f0e4 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:39:51 +0000 Subject: [PATCH 072/115] dhcpd module: use mkEnableOption --- nixos/modules/services/networking/dhcpd.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix index 900df67b53aa0..108421bd9fb7c 100644 --- a/nixos/modules/services/networking/dhcpd.nix +++ b/nixos/modules/services/networking/dhcpd.nix @@ -39,12 +39,7 @@ in services.dhcpd = { - enable = mkOption { - default = false; - description = " - Whether to enable the DHCP server. - "; - }; + enable = mkEnableOption "the DHCP server"; extraConfig = mkOption { default = ""; From fc1a81cc8860d129005b664745a7cc8e267ae03a Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:39:57 +0000 Subject: [PATCH 073/115] ircd-hybrid module: use mkEnableOption --- nixos/modules/services/networking/ircd-hybrid/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix index ede57c5046d38..c0558805c08f2 100644 --- a/nixos/modules/services/networking/ircd-hybrid/default.nix +++ b/nixos/modules/services/networking/ircd-hybrid/default.nix @@ -36,12 +36,7 @@ in services.ircdHybrid = { - enable = mkOption { - default = false; - description = " - Enable IRCD. - "; - }; + enable = mkEnableOption "IRCD"; serverName = mkOption { default = "hades.arpa"; From ef228dc7b617ac49f095ba2aa177ed4a9aa881e2 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:40:01 +0000 Subject: [PATCH 074/115] kippo module: use mkEnableOption --- nixos/modules/services/networking/kippo.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix index 5f3efcd133a1b..cc6a934668e69 100644 --- a/nixos/modules/services/networking/kippo.nix +++ b/nixos/modules/services/networking/kippo.nix @@ -14,11 +14,7 @@ in rec { options = { services.kippo = { - enable = mkOption { - default = false; - type = types.bool; - description = ''Enable the kippo honeypot ssh server.''; - }; + enable = mkEnableOption "the kippo honeypot ssh server"; port = mkOption { default = 2222; type = types.int; From 834f2e92437ee8a567ed2ff5e3812c82861bd465 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:40:05 +0000 Subject: [PATCH 075/115] mailpile module: use mkEnableOption --- nixos/modules/services/networking/mailpile.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/mailpile.nix b/nixos/modules/services/networking/mailpile.nix index e164d41483c7f..1d8627b4287ad 100644 --- a/nixos/modules/services/networking/mailpile.nix +++ b/nixos/modules/services/networking/mailpile.nix @@ -18,12 +18,7 @@ in options = { services.mailpile = { - enable = mkOption { - default = false; - description = " - Whether to enable Mailpile the mail client. - "; - }; + enable = mkEnableOption "Mailpile the mail client"; hostname = mkOption { default = "localhost"; description = "Listen to this hostname or ip."; From 28bb32624ece462543333b54dc85b9cf240f85b7 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:40:16 +0000 Subject: [PATCH 076/115] mstpd module: use mkEnableOption --- nixos/modules/services/networking/mstpd.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/networking/mstpd.nix b/nixos/modules/services/networking/mstpd.nix index 5d1fc4a65427d..28d3ed48868a2 100644 --- a/nixos/modules/services/networking/mstpd.nix +++ b/nixos/modules/services/networking/mstpd.nix @@ -6,13 +6,7 @@ with lib; { options.services.mstpd = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Whether to enable the multiple spanning tree protocol daemon. - ''; - }; + enable = mkEnableOption "the multiple spanning tree protocol daemon"; }; From 7b0ab9bd40cc5f5a2ccb2ced526501e644a85de6 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:40:18 +0000 Subject: [PATCH 077/115] nat module: use mkEnableOption --- nixos/modules/services/networking/nat.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix index 9d163e60d5eaf..79321b7705246 100644 --- a/nixos/modules/services/networking/nat.nix +++ b/nixos/modules/services/networking/nat.nix @@ -66,14 +66,7 @@ in options = { - networking.nat.enable = mkOption { - type = types.bool; - default = false; - description = - '' - Whether to enable Network Address Translation (NAT). - ''; - }; + networking.nat.enable = mkEnableOption "Network Address Translation (NAT)"; networking.nat.internalInterfaces = mkOption { type = types.listOf types.str; From c89dec416f22dae69dc4d89d4b04d032dce575d8 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:40:48 +0000 Subject: [PATCH 078/115] privoxy module: use mkEnableOption --- nixos/modules/services/networking/privoxy.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix index 94beb78ef5a46..cb67730d729bf 100644 --- a/nixos/modules/services/networking/privoxy.nix +++ b/nixos/modules/services/networking/privoxy.nix @@ -30,13 +30,7 @@ in services.privoxy = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the Privoxy non-caching filtering proxy. - ''; - }; + enable = mkEnableOption "the Privoxy non-caching filtering proxy"; listenAddress = mkOption { type = types.str; From e341d3575835880f491c50870409955f66d9d915 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:40:58 +0000 Subject: [PATCH 079/115] sabnzbd module: use mkEnableOption --- nixos/modules/services/networking/sabnzbd.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/sabnzbd.nix b/nixos/modules/services/networking/sabnzbd.nix index cacf753fdcd7c..bb2808cd16eb8 100644 --- a/nixos/modules/services/networking/sabnzbd.nix +++ b/nixos/modules/services/networking/sabnzbd.nix @@ -15,10 +15,7 @@ in options = { services.sabnzbd = { - enable = mkOption { - default = false; - description = "Whether to enable the sabnzbd server."; - }; + enable = mkEnableOption "the sabnzbd server"; configFile = mkOption { default = "/var/lib/sabnzbd/sabnzbd.ini"; description = "Path to config file."; From 6855451f47342dd12c5adfb3658e0258ff7e6575 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:41:04 +0000 Subject: [PATCH 080/115] seeks module: use mkEnableOption --- nixos/modules/services/networking/seeks.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/networking/seeks.nix b/nixos/modules/services/networking/seeks.nix index f5bc60be34576..f599c5920c005 100644 --- a/nixos/modules/services/networking/seeks.nix +++ b/nixos/modules/services/networking/seeks.nix @@ -20,13 +20,7 @@ in services.seeks = { - enable = mkOption { - default = false; - type = types.bool; - description = " - Whether to enable the Seeks server. - "; - }; + enable = mkEnableOption "the Seeks server"; confDir = mkOption { default = ""; From 1ebba70280ac8eebe18610e7f58bdf523c3591b0 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:41:10 +0000 Subject: [PATCH 081/115] spiped module: use mkEnableOption --- nixos/modules/services/networking/spiped.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/spiped.nix b/nixos/modules/services/networking/spiped.nix index 005d7182351ab..a00c9998d4c9f 100644 --- a/nixos/modules/services/networking/spiped.nix +++ b/nixos/modules/services/networking/spiped.nix @@ -8,11 +8,7 @@ in { options = { services.spiped = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable the spiped service module."; - }; + enable = mkEnableOption "the spiped service module"; config = mkOption { type = types.attrsOf (types.submodule ( From d86c2f0ea027e3c3baab7577bee87a0da68f6c7c Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:41:18 +0000 Subject: [PATCH 082/115] tftpd module: use mkEnableOption --- nixos/modules/services/networking/tftpd.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/networking/tftpd.nix b/nixos/modules/services/networking/tftpd.nix index 9b3cc6b8ec4f0..098401c1f5671 100644 --- a/nixos/modules/services/networking/tftpd.nix +++ b/nixos/modules/services/networking/tftpd.nix @@ -8,13 +8,7 @@ with lib; options = { - services.tftpd.enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable tftpd, a Trivial File Transfer Protocol server. - ''; - }; + services.tftpd.enable = mkEnableOption "tftpd, a Trivial File Transfer Protocol server"; services.tftpd.path = mkOption { type = types.path; From 063d81c69579baaa98a7221dfb4f6e39261672f7 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:41:20 +0000 Subject: [PATCH 083/115] tlsdated module: use mkEnableOption --- nixos/modules/services/networking/tlsdated.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/networking/tlsdated.nix b/nixos/modules/services/networking/tlsdated.nix index 757cce2876079..0e0d301e60586 100644 --- a/nixos/modules/services/networking/tlsdated.nix +++ b/nixos/modules/services/networking/tlsdated.nix @@ -16,13 +16,7 @@ in services.tlsdated = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable tlsdated daemon. - ''; - }; + enable = mkEnableOption "tlsdated daemon"; extraOptions = mkOption { type = types.string; From 19e3e802095be76f7db66b8abe7a2e8544939322 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:41:33 +0000 Subject: [PATCH 084/115] tox-bootstrapd module: use mkEnableOption --- nixos/modules/services/networking/tox-bootstrapd.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/nixos/modules/services/networking/tox-bootstrapd.nix b/nixos/modules/services/networking/tox-bootstrapd.nix index c1f945773e232..5e60299cb0902 100644 --- a/nixos/modules/services/networking/tox-bootstrapd.nix +++ b/nixos/modules/services/networking/tox-bootstrapd.nix @@ -19,14 +19,7 @@ in { options = { services.toxBootstrapd = - { enable = mkOption { - type = types.bool; - default = false; - description = - '' - Whether to enable the Tox DHT bootstrap daemon. - ''; - }; + { enable = mkEnableOption "the Tox DHT bootstrap daemon"; port = mkOption { type = types.int; From c576da5c2e98d54686c7f862016400392178335a Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:41:36 +0000 Subject: [PATCH 085/115] vsftpd module: use mkEnableOption --- nixos/modules/services/networking/vsftpd.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index 7ec484941ede1..118b24c397004 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -112,10 +112,7 @@ in services.vsftpd = { - enable = mkOption { - default = false; - description = "Whether to enable the vsftpd FTP server."; - }; + enable = mkEnableOption "the vsftpd FTP server"; userlist = mkOption { default = []; From 71e52e1e5d0a107384b75b6dc5a97dcc51005c0d Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:41:44 +0000 Subject: [PATCH 086/115] websockify module: use mkEnableOption --- nixos/modules/services/networking/websockify.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/networking/websockify.nix b/nixos/modules/services/networking/websockify.nix index 4b76350ecf8a7..5668d5fa6342c 100644 --- a/nixos/modules/services/networking/websockify.nix +++ b/nixos/modules/services/networking/websockify.nix @@ -5,13 +5,7 @@ with lib; let cfg = config.services.networking.websockify; in { options = { services.networking.websockify = { - enable = mkOption { - description = "Whether to enable websockify to forward websocket connections to TCP connections."; - - default = false; - - type = types.bool; - }; + enable = mkEnableOption "websockify to forward websocket connections to TCP connections"; sslCert = mkOption { description = "Path to the SSL certificate."; From 34d683aaf19a85c66e7dffc61628aea701ab7501 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:41:47 +0000 Subject: [PATCH 087/115] xinetd module: use mkEnableOption --- nixos/modules/services/networking/xinetd.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix index 08680b517808a..e23ca64495816 100644 --- a/nixos/modules/services/networking/xinetd.nix +++ b/nixos/modules/services/networking/xinetd.nix @@ -44,12 +44,7 @@ in options = { - services.xinetd.enable = mkOption { - default = false; - description = '' - Whether to enable the xinetd super-server daemon. - ''; - }; + services.xinetd.enable = mkEnableOption "the xinetd super-server daemon"; services.xinetd.extraDefaults = mkOption { default = ""; From 7c8809a9e11ffdc04ab3dc19400db82e2bbc2092 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:41:57 +0000 Subject: [PATCH 088/115] atd module: use mkEnableOption --- nixos/modules/services/scheduling/atd.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix index 2070b2ffa0186..bf59d62fb0a81 100644 --- a/nixos/modules/services/scheduling/atd.nix +++ b/nixos/modules/services/scheduling/atd.nix @@ -16,13 +16,7 @@ in options = { - services.atd.enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the at daemon, a command scheduler. - ''; - }; + services.atd.enable = mkEnableOption "the at daemon, a command scheduler"; services.atd.allowEveryone = mkOption { type = types.bool; From 5887275780782d1a6ab93091917aa91887b053a4 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:42:31 +0000 Subject: [PATCH 089/115] chronos module: use mkEnableOption --- nixos/modules/services/scheduling/chronos.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/scheduling/chronos.nix b/nixos/modules/services/scheduling/chronos.nix index db1f0f5f00c99..11aaf3f991633 100644 --- a/nixos/modules/services/scheduling/chronos.nix +++ b/nixos/modules/services/scheduling/chronos.nix @@ -10,11 +10,7 @@ in { ###### interface options.services.chronos = { - enable = mkOption { - description = "Whether to enable graphite web frontend."; - default = false; - type = types.bool; - }; + enable = mkEnableOption "graphite web frontend"; httpPort = mkOption { description = "Chronos listening port"; From 806beb2e6b1da54dda0bcd32665ff472b5b28338 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:42:35 +0000 Subject: [PATCH 090/115] cron module: use mkEnableOption --- nixos/modules/services/scheduling/cron.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix index f5e132fd77d87..ffb57a260db6a 100644 --- a/nixos/modules/services/scheduling/cron.nix +++ b/nixos/modules/services/scheduling/cron.nix @@ -37,11 +37,7 @@ in services.cron = { - enable = mkOption { - type = types.bool; - example = true; - description = "Whether to enable the Vixie cron daemon."; - }; + enable = mkEnableOption "the Vixie cron daemon"; mailto = mkOption { type = types.nullOr types.str; From 6736abd279606b03f1d5d18007038ddcb7ea4f8b Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:42:40 +0000 Subject: [PATCH 091/115] fcron module: use mkEnableOption --- nixos/modules/services/scheduling/fcron.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index 7b4665a820467..5c73334950994 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -36,11 +36,7 @@ in services.fcron = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the fcron daemon."; - }; + enable = mkEnableOption "the fcron daemon"; allow = mkOption { type = types.listOf types.str; From ebd11af0c8a40945d7d16fb8c718f8a2462dd38c Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:42:46 +0000 Subject: [PATCH 092/115] marathon module: use mkEnableOption --- nixos/modules/services/scheduling/marathon.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixos/modules/services/scheduling/marathon.nix index 4e837c62dc117..f045f479edf43 100644 --- a/nixos/modules/services/scheduling/marathon.nix +++ b/nixos/modules/services/scheduling/marathon.nix @@ -11,13 +11,7 @@ in { ###### interface options.services.marathon = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the marathon mesos framework. - ''; - }; + enable = mkEnableOption "the marathon mesos framework"; master = mkOption { type = types.str; From eb08ad9a0bd09e847860c5fa30fe78c7c91ed0cb Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:42:47 +0000 Subject: [PATCH 093/115] elasticsearch module: use mkEnableOption --- nixos/modules/services/search/elasticsearch.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 9299aaac2f70e..5ede097b448a0 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -33,11 +33,7 @@ in { ###### interface options.services.elasticsearch = { - enable = mkOption { - description = "Whether to enable elasticsearch."; - default = false; - type = types.bool; - }; + enable = mkEnableOption "elasticsearch"; package = mkOption { description = "Elasticsearch package to use."; From a908a582d7ed35a91e2d9b0c823e86d1569eee48 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:42:49 +0000 Subject: [PATCH 094/115] fail2ban module: use mkEnableOption --- nixos/modules/services/security/fail2ban.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index 22e3bb0066cc0..2edabc44754f6 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -25,11 +25,7 @@ in options = { services.fail2ban = { - enable = mkOption { - default = false; - type = types.bool; - description = "Whether to enable the fail2ban service."; - }; + enable = mkEnableOption "the fail2ban service"; daemonConfig = mkOption { default = From dafa7fcd499f1dcfa6eddea66cb635b9caf7d409 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:42:57 +0000 Subject: [PATCH 095/115] fprintd module: use mkEnableOption --- nixos/modules/services/security/fprintd.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/security/fprintd.nix b/nixos/modules/services/security/fprintd.nix index a35b065ba8156..01e9c5b3ce003 100644 --- a/nixos/modules/services/security/fprintd.nix +++ b/nixos/modules/services/security/fprintd.nix @@ -17,13 +17,7 @@ in services.fprintd = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable fprintd daemon and PAM module for fingerprint readers handling. - ''; - }; + enable = mkEnableOption "fprintd daemon and PAM module for fingerprint readers handling"; }; From 532e2568f497e68f268f8c7bc851a6d08b6029a5 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:42:59 +0000 Subject: [PATCH 096/115] fprot module: use mkEnableOption --- nixos/modules/services/security/fprot.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix index a12aa01503e3e..eac1fc17b3472 100644 --- a/nixos/modules/services/security/fprot.nix +++ b/nixos/modules/services/security/fprot.nix @@ -10,12 +10,7 @@ in { services.fprot = { updater = { - enable = mkOption { - default = false; - description = '' - Whether to enable automatic F-Prot virus definitions database updates. - ''; - }; + enable = mkEnableOption "automatic F-Prot virus definitions database updates"; productData = mkOption { description = '' From 68f36ff62f36033ee1aef5039f8bbdf4f36fa793 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:43:15 +0000 Subject: [PATCH 097/115] kerberos module: use mkEnableOption import mkImportOption --- nixos/modules/services/system/kerberos.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix index 4f2e2fdf662b2..c2ad24cce7c2d 100644 --- a/nixos/modules/services/system/kerberos.nix +++ b/nixos/modules/services/system/kerberos.nix @@ -2,7 +2,7 @@ let - inherit (lib) mkOption mkIf singleton; + inherit (lib) mkEnableOption mkOption mkIf singleton; inherit (pkgs) heimdalFull; @@ -17,12 +17,7 @@ in services.kerberos_server = { - enable = mkOption { - default = false; - description = '' - Enable the kerberos authentification server. - ''; - }; + enable = mkEnableOption "the kerberos authentification server"; }; From cb7a80814a657514b6d8e0ac9841728fdd54f780 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:43:19 +0000 Subject: [PATCH 098/115] peerflix module: use mkEnableOption --- nixos/modules/services/torrent/peerflix.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/torrent/peerflix.nix b/nixos/modules/services/torrent/peerflix.nix index 38fbd3b226cdc..bea5dfabf88d0 100644 --- a/nixos/modules/services/torrent/peerflix.nix +++ b/nixos/modules/services/torrent/peerflix.nix @@ -17,11 +17,7 @@ in { ###### interface options.services.peerflix = { - enable = mkOption { - description = "Whether to enable peerflix service."; - default = false; - type = types.bool; - }; + enable = mkEnableOption "peerflix service"; stateDir = mkOption { description = "Peerflix state directory."; From 6beab54a7264eaae341630fea6fce009f8281a1a Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:43:25 +0000 Subject: [PATCH 099/115] apache-httpd module: use mkEnableOption --- nixos/modules/services/web-servers/apache-httpd/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 397857ea0858a..ff529edf6fda8 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -424,11 +424,7 @@ in services.httpd = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the Apache HTTP Server."; - }; + enable = mkEnableOption "the Apache HTTP Server"; package = mkOption { type = types.package; From 84c24bba4fc66cef689dcf7377a3f3ee285ed6c0 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:43:27 +0000 Subject: [PATCH 100/115] fcgiwrap module: use mkEnableOption --- nixos/modules/services/web-servers/fcgiwrap.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/web-servers/fcgiwrap.nix b/nixos/modules/services/web-servers/fcgiwrap.nix index 2c5e433003c8c..6472460b02a2f 100644 --- a/nixos/modules/services/web-servers/fcgiwrap.nix +++ b/nixos/modules/services/web-servers/fcgiwrap.nix @@ -8,11 +8,7 @@ in { options = { services.fcgiwrap = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable fcgiwrap, a server for running CGI applications over FastCGI."; - }; + enable = mkEnableOption "fcgiwrap, a server for running CGI applications over FastCGI"; preforkProcesses = mkOption { type = types.int; From 857814cfd4fda91e75315f2e5e3d94aa2c5e8226 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:43:30 +0000 Subject: [PATCH 101/115] lighttpd module: use mkEnableOption --- nixos/modules/services/web-servers/lighttpd/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index 84cd0a4095d92..955543a404332 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -119,13 +119,7 @@ in services.lighttpd = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Enable the lighttpd web server. - ''; - }; + enable = mkEnableOption "the lighttpd web server"; port = mkOption { default = 80; From b13f50bd943bc2a63a36cb66a4356b6cf6b6ca6c Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:43:39 +0000 Subject: [PATCH 102/115] varnish module: use mkEnableOption --- nixos/modules/services/web-servers/varnish/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix index 61df43ec23524..b210c7dc227ab 100644 --- a/nixos/modules/services/web-servers/varnish/default.nix +++ b/nixos/modules/services/web-servers/varnish/default.nix @@ -7,12 +7,7 @@ with lib; { options = { services.varnish = { - enable = mkOption { - default = false; - description = " - Enable the Varnish Server. - "; - }; + enable = mkEnableOption "the Varnish Server"; http_address = mkOption { default = "*:6081"; From 15910baf1e60e6614cc9d9a495f15e2b80feafc8 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:43:52 +0000 Subject: [PATCH 103/115] enlightenment module: use mkEnableOption --- .../modules/services/x11/desktop-managers/enlightenment.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 8a03dd65b3359..bf44c8fb1a54d 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -18,11 +18,7 @@ in { options = { - services.xserver.desktopManager.enlightenment.enable = mkOption { - default = false; - example = true; - description = "Enable the Enlightenment desktop environment."; - }; + services.xserver.desktopManager.enlightenment.enable = mkEnableOption "the Enlightenment desktop environment"; }; From f86d351324c6824eb0272f9a98189517c439b1e4 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:43:54 +0000 Subject: [PATCH 104/115] gnome3 module: use mkEnableOption --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index b3da254480296..907113cc66c60 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -53,11 +53,7 @@ in { options = { services.xserver.desktopManager.gnome3 = { - enable = mkOption { - default = false; - example = true; - description = "Enable Gnome 3 desktop manager."; - }; + enable = mkEnableOption "Gnome 3 desktop manager"; sessionPath = mkOption { default = []; From 21df0a33ba3dd3918076f750d5e43a5c1c9ba6e8 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:44:00 +0000 Subject: [PATCH 105/115] kde4 module: use mkEnableOption --- nixos/modules/services/x11/desktop-managers/kde4.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix index 1927341e45d4e..d9b751794fd70 100644 --- a/nixos/modules/services/x11/desktop-managers/kde4.nix +++ b/nixos/modules/services/x11/desktop-managers/kde4.nix @@ -50,11 +50,7 @@ in options = { services.xserver.desktopManager.kde4 = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable the KDE 4 desktop environment."; - }; + enable = mkEnableOption "the KDE 4 desktop environment"; phononBackends = mkOption { type = types.listOf types.str; From 3fda3fde46356c9039e97ac47a7e25185f97fe4d Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:44:02 +0000 Subject: [PATCH 106/115] kde5 module: use mkEnableOption --- nixos/modules/services/x11/desktop-managers/kde5.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index bc010d1ce1cf1..385ea48dc2cc2 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -16,11 +16,7 @@ in options = { services.xserver.desktopManager.kde5 = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable the Plasma 5 (KDE 5) desktop environment."; - }; + enable = mkEnableOption "the Plasma 5 (KDE 5) desktop environment"; }; From c239e3b8c823751515c44a8c1fa6784fc34a964a Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:44:05 +0000 Subject: [PATCH 107/115] kodi module: use mkEnableOption --- nixos/modules/services/x11/desktop-managers/kodi.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixos/modules/services/x11/desktop-managers/kodi.nix index de00ff93b17c9..906364e941804 100644 --- a/nixos/modules/services/x11/desktop-managers/kodi.nix +++ b/nixos/modules/services/x11/desktop-managers/kodi.nix @@ -9,11 +9,7 @@ in { options = { services.xserver.desktopManager.kodi = { - enable = mkOption { - default = false; - example = true; - description = "Enable the kodi multimedia center."; - }; + enable = mkEnableOption "the kodi multimedia center"; }; }; From 0feb7a7378917322ae2930a996208351c44cb845 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:44:08 +0000 Subject: [PATCH 108/115] xfce module: use mkEnableOption --- nixos/modules/services/x11/desktop-managers/xfce.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 634d2a39576a2..7550fbffd4e2e 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -13,11 +13,7 @@ in options = { services.xserver.desktopManager.xfce = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable the Xfce desktop environment."; - }; + enable = mkEnableOption "the Xfce desktop environment"; thunarPlugins = mkOption { default = []; From 9dc97c2d23a936b76cf540bf160575e06526489b Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:44:12 +0000 Subject: [PATCH 109/115] kdm module: use mkEnableOption --- nixos/modules/services/x11/display-managers/kdm.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix index d9f7f8f0dfc40..04087ea5cc083 100644 --- a/nixos/modules/services/x11/display-managers/kdm.nix +++ b/nixos/modules/services/x11/display-managers/kdm.nix @@ -78,13 +78,7 @@ in services.xserver.displayManager.kdm = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the KDE display manager. - ''; - }; + enable = mkEnableOption "the KDE display manager"; enableXDMCP = mkOption { type = types.bool; From 7525dc0ab4926cc667e2d7235b907c44a1a822d1 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:44:15 +0000 Subject: [PATCH 110/115] slim module: use mkEnableOption --- nixos/modules/services/x11/display-managers/slim.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index ce44c9f54a318..0e9b2ae469d8b 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -47,13 +47,7 @@ in services.xserver.displayManager.slim = { - enable = mkOption { - type = types.bool; - default = config.services.xserver.enable; - description = '' - Whether to enable SLiM as the display manager. - ''; - }; + enable = mkEnableOption "SLiM as the display manager"; theme = mkOption { type = types.nullOr types.path; From 687d97954e6010d43c6cdabbeee0b9ee862b06c3 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:44:19 +0000 Subject: [PATCH 111/115] xfs module: use mkEnableOption --- nixos/modules/services/x11/xfs.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/services/x11/xfs.nix b/nixos/modules/services/x11/xfs.nix index ea7cfa1aa43c5..6bba8de167d9c 100644 --- a/nixos/modules/services/x11/xfs.nix +++ b/nixos/modules/services/x11/xfs.nix @@ -16,11 +16,7 @@ in services.xfs = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the X Font Server."; - }; + enable = mkEnableOption "the X Font Server"; }; From ef77f33d292a6f52d36a489840e5213fe3484c7e Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:44:37 +0000 Subject: [PATCH 112/115] resolved module: use mkEnableOption --- nixos/modules/system/boot/resolved.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 4b7c545dcc0d8..8021e94cd2546 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -8,13 +8,7 @@ in options = { - services.resolved.enable = mkOption { - default = false; - type = types.bool; - description = '' - Whether to enable the systemd DNS resolver daemon. - ''; - }; + services.resolved.enable = mkEnableOption "the systemd DNS resolver daemon"; services.resolved.fallbackDns = mkOption { default = [ ]; From 721f80cdb0985050803666898be981e2470f0f70 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:44:43 +0000 Subject: [PATCH 113/115] trackpoint module: use mkEnableOption --- nixos/modules/tasks/trackpoint.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index 32e69dd2bf587..6f0572d6cf0b0 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -9,13 +9,7 @@ with lib; hardware.trackpoint = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Enable sensitivity and speed configuration for trackpoints. - ''; - }; + enable = mkEnableOption "sensitivity and speed configuration for trackpoints"; sensitivity = mkOption { default = 128; From 111761d6d7f356a8fa99c9f8281e0a02ec7cc0a6 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:44:45 +0000 Subject: [PATCH 114/115] azure-agent module: use mkEnableOption --- nixos/modules/virtualisation/azure-agent.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix index 6817eb837a018..5a997a434b61e 100644 --- a/nixos/modules/virtualisation/azure-agent.nix +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -58,10 +58,7 @@ in ###### interface options.virtualisation.azure.agent = { - enable = mkOption { - default = false; - description = "Whether to enable the Windows Azure Linux Agent."; - }; + enable = mkEnableOption "the Windows Azure Linux Agent"; verboseLogging = mkOption { default = false; description = "Whether to enable verbose logging."; From 10983534a240f8218fc3c1ea889911ebd8d56349 Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Mon, 12 Sep 2016 05:44:55 +0000 Subject: [PATCH 115/115] virtualbox-guest module: use mkEnableOption --- nixos/modules/virtualisation/virtualbox-guest.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index d253e9eab62b3..a100cd6695523 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -15,10 +15,7 @@ in ###### interface - options.virtualisation.virtualbox.guest.enable = mkOption { - default = false; - description = "Whether to enable the VirtualBox service and other guest additions."; - }; + options.virtualisation.virtualbox.guest.enable = mkEnableOption "the VirtualBox service and other guest additions"; ###### implementation