NixOS · langston-barrett · Sep 12, 2016 · Sep 12, 2016 · Sep 12, 2016 · Sep 12, 2016
diff --git 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";

diff --git 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;

diff --git 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

diff --git 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 = [];

diff --git 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 ];

diff --git 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;

diff --git 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 = ''

diff --git 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;

diff --git 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";

diff --git 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 * * *";

diff --git 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 * * *";

diff --git 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;

diff --git 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;

diff --git 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";

diff --git 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;

diff --git 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 = "";

diff --git 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;

diff --git 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";

diff --git 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;

diff --git 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;

diff --git 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;

diff --git 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.";

diff --git 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;

diff --git 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 = "";

diff --git 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";
 
     };