treewide: add bool type to enable options, or make use of mkEnableOption

Add missing type information to manually specified enable options or replace them by mkEnableOption where appropriate.

nixos/modules/programs/cdemu.nix

@@ -8,6 +8,7 @@ in {
   options = {
     programs.cdemu = {
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           <command>cdemu</command> for members of

nixos/modules/programs/criu.nix

@@ -8,6 +8,7 @@ in {
   options = {
     programs.criu = {
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Install <command>criu</command> along with necessary kernel options.

nixos/modules/programs/systemtap.nix

@@ -8,6 +8,7 @@ in {
   options = {
     programs.systemtap = {
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Install <command>systemtap</command> along with necessary kernel options.

nixos/modules/programs/zsh/oh-my-zsh.nix

@@ -39,6 +39,7 @@ in
     options = {
       programs.zsh.ohMyZsh = {
         enable = mkOption {
+          type = types.bool;
           default = false;
           description = ''
             Enable oh-my-zsh.

nixos/modules/services/amqp/rabbitmq.nix

@@ -17,6 +17,7 @@ in {
   options = {
     services.rabbitmq = {
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to enable the RabbitMQ server, an Advanced Message

nixos/modules/services/backup/mysql-backup.nix

@@ -37,12 +37,7 @@ in
 
     services.mysqlBackup = {
 
-      enable = mkOption {
+      enable = mkEnableOption "MySQL backups";
-        default = false;
-        description = ''
-          Whether to enable MySQL backups.
-        '';
-      };
 
       calendar = mkOption {
         type = types.str;

nixos/modules/services/backup/postgresql-backup.nix

@@ -44,12 +44,7 @@ in {
 
   options = {
     services.postgresqlBackup = {
-      enable = mkOption {
+      enable = mkEnableOption "PostgreSQL dumps";
-        default = false;
-        description = ''
-          Whether to enable PostgreSQL dumps.
-        '';
-      };
 
       startAt = mkOption {
         default = "*-*-* 01:15:00";

nixos/modules/services/databases/clickhouse.nix

@@ -11,10 +11,7 @@ with lib;
 
     services.clickhouse = {
 
-      enable = mkOption {
+      enable = mkEnableOption "ClickHouse database server";
-        default = false;
-        description = "Whether to enable ClickHouse database server.";
-      };
 
     };
 

nixos/modules/services/databases/firebird.nix

@@ -40,12 +40,7 @@ in
 
     services.firebird = {
 
-      enable = mkOption {
+      enable = mkEnableOption "the Firebird super server";
-        default = false;
-        description = ''
-          Whether to enable the Firebird super server.
-        '';
-      };
 
       package = mkOption {
         default = pkgs.firebirdSuper;

nixos/modules/services/databases/memcached.nix

@@ -18,12 +18,7 @@ in
 
     services.memcached = {
 
-      enable = mkOption {
+      enable = mkEnableOption "Memcached";
-        default = false;
-        description = "
-          Whether to enable Memcached.
-        ";
-      };
 
       user = mkOption {
         default = "memcached";

nixos/modules/services/databases/mongodb.nix

@@ -29,12 +29,7 @@ in
 
     services.mongodb = {
 
-      enable = mkOption {
+      enable = mkEnableOption "the MongoDB server";
-        default = false;
-        description = "
-          Whether to enable the MongoDB server.
-        ";
-      };
 
       package = mkOption {
         default = pkgs.mongodb;

nixos/modules/services/databases/virtuoso.nix

@@ -13,10 +13,7 @@ with lib;
 
     services.virtuoso = {
 
-      enable = mkOption {
+      enable = mkEnableOption "Virtuoso Opensource database server";
-        default = false;
-        description = "Whether to enable Virtuoso Opensource database server.";
-      };
 
       config = mkOption {
         default = "";

nixos/modules/services/hardware/ratbagd.nix

@@ -10,12 +10,7 @@ in
 
   options = {
     services.ratbagd = {
-      enable = mkOption {
+      enable = mkEnableOption "ratbagd for configuring gaming mice";
-        default = false;
-        description = ''
-          Whether to enable ratbagd for configuring gaming mice.
-        '';
-      };
     };
   };
 

nixos/modules/services/hardware/thermald.nix

@@ -8,12 +8,7 @@ in {
   ###### interface
   options = {
     services.thermald = {
-      enable = mkOption {
+      enable = mkEnableOption "thermald, the temperature management daemon";
-        default = false;
-        description = ''
-          Whether to enable thermald, the temperature management daemon.
-        '';
-      };
 
       debug = mkOption {
         type = types.bool;

nixos/modules/services/mail/spamassassin.nix

@@ -12,10 +12,7 @@ in
   options = {
 
     services.spamassassin = {
-      enable = mkOption {
+      enable = mkEnableOption "the SpamAssassin daemon";
-        default = false;
-        description = "Whether to run the SpamAssassin daemon";
-      };
 
       debug = mkOption {
         default = false;

nixos/modules/services/misc/autofs.nix

@@ -19,6 +19,7 @@ in
     services.autofs = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Mount filesystems on demand. Unmount them automatically.

nixos/modules/services/misc/cgminer.nix

@@ -31,13 +31,7 @@ in
 
     services.cgminer = {
 
-      enable = mkOption {
+      enable = mkEnableOption "cgminer, an ASIC/FPGA/GPU miner for bitcoin and litecoin";
-        default = false;
-        description = ''
-          Whether to enable cgminer, an ASIC/FPGA/GPU miner for bitcoin and
-          litecoin.
-        '';
-      };
 
       package = mkOption {
         default = pkgs.cgminer;

nixos/modules/services/misc/devmon.nix

@@ -8,12 +8,7 @@ let
 in {
   options = {
     services.devmon = {
-      enable = mkOption {
+      enable = mkEnableOption "devmon, an automatic device mounting daemon";
-        default = false;
-        description = ''
-          Whether to enable devmon, an automatic device mounting daemon.
-        '';
-      };
     };
   };
 

nixos/modules/services/misc/disnix.nix

@@ -17,10 +17,7 @@ in
 
     services.disnix = {
 
-      enable = mkOption {
+      enable = mkEnableOption "Disnix";
-        default = false;
-        description = "Whether to enable Disnix";
-      };
 
       enableMultiUser = mkOption {
         type = types.bool;

nixos/modules/services/misc/felix.nix

@@ -17,10 +17,7 @@ in
 
     services.felix = {
 
-      enable = mkOption {
+      enable = mkEnableOption "the Apache Felix OSGi service";
-        default = false;
-        description = "Whether to enable the Apache Felix OSGi service";
-      };
 
       bundles = mkOption {
         type = types.listOf types.package;

nixos/modules/services/misc/ihaskell.nix

@@ -15,6 +15,7 @@ in
   options = {
     services.ihaskell = {
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = "Autostart an IHaskell notebook service.";
       };

nixos/modules/services/misc/safeeyes.nix

@@ -16,10 +16,7 @@ in
 
     services.safeeyes = {
 
-      enable = mkOption {
+      enable = mkEnableOption "the safeeyes OSGi service";
-        default = false;
-        description = "Whether to enable the safeeyes OSGi service";
-      };
 
     };
 

nixos/modules/services/misc/svnserve.nix

@@ -18,6 +18,7 @@ in
     services.svnserve = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = "Whether to enable svnserve to serve Subversion repositories through the SVN protocol.";
       };

nixos/modules/services/misc/synergy.nix

@@ -19,12 +19,8 @@ in
       # !!! All these option descriptions needs to be cleaned up.
 
       client = {
-        enable = mkOption {
+        enable = mkEnableOption "the Synergy client (receive keyboard and mouse events from a Synergy server)";
-          default = false;
+
-          description = "
-            Whether to enable the Synergy client (receive keyboard and mouse events from a Synergy server).
-          ";
-        };
         screenName = mkOption {
           default = "";
           description = ''
@@ -47,12 +43,8 @@ in
       };
 
       server = {
-        enable = mkOption {
+        enable = mkEnableOption "the Synergy server (send keyboard and mouse events)";
-          default = false;
+
-          description = ''
-            Whether to enable the Synergy server (send keyboard and mouse events).
-          '';
-        };
         configFile = mkOption {
           default = "/etc/synergy-server.conf";
           description = "The Synergy server configuration file.";

nixos/modules/services/network-filesystems/netatalk.nix

@@ -43,10 +43,7 @@ in
   options = {
     services.netatalk = {
 
-      enable = mkOption {
+      enable = mkEnableOption "the Netatalk AFP fileserver";
-          default = false;
-          description = "Whether to enable the Netatalk AFP fileserver.";
-        };
 
       port = mkOption {
         default = 548;
@@ -65,6 +62,7 @@ in
 
       homes = {
         enable = mkOption {
+          type = types.bool;
           default = false;
           description = "Enable sharing of the UNIX server user home directories.";
         };

nixos/modules/services/network-filesystems/rsyncd.nix

@@ -29,10 +29,7 @@ in
   options = {
     services.rsyncd = {
 
-      enable = mkOption {
+      enable = mkEnableOption "the rsync daemon";
-        default = false;
-        description = "Whether to enable the rsync daemon.";
-      };
 
       motd = mkOption {
         type = types.str;

nixos/modules/services/network-filesystems/xtreemfs.nix

@@ -100,11 +100,13 @@ in
 
       dir = {
         enable = mkOption {
+          type = types.bool;
           default = true;
           description = ''
             Whether to enable XtreemFS DIR service.
           '';
         };
+
         uuid = mkOption {
           example = "eacb6bab-f444-4ebf-a06a-3f72d7465e40";
           description = ''
@@ -218,11 +220,13 @@ in
 
       mrc = {
         enable = mkOption {
+          type = types.bool;
           default = true;
           description = ''
             Whether to enable XtreemFS MRC service.
           '';
         };
+
         uuid = mkOption {
           example = "eacb6bab-f444-4ebf-a06a-3f72d7465e41";
           description = ''
@@ -354,11 +358,13 @@ in
 
       osd = {
         enable = mkOption {
+          type = types.bool;
           default = true;
           description = ''
             Whether to enable XtreemFS OSD service.
           '';
         };
+
         uuid = mkOption {
           example = "eacb6bab-f444-4ebf-a06a-3f72d7465e42";
           description = ''

nixos/modules/services/network-filesystems/yandex-disk.nix

@@ -21,6 +21,7 @@ in
     services.yandex-disk = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = "
           Whether to enable Yandex-disk client. See https://disk.yandex.ru/

nixos/modules/services/networking/amuled.nix

@@ -16,6 +16,7 @@ in
     services.amule = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to run the AMule daemon. You need to manually run "amuled --ec-config" to configure the service for the first time.

nixos/modules/services/networking/babeld.nix

@@ -35,12 +35,7 @@ in
 
     services.babeld = {
 
-      enable = mkOption {
+      enable = mkEnableOption "the babeld network routing daemon";
-        default = false;
-        description = ''
-          Whether to run the babeld network routing daemon.
-        '';
-      };
 
       interfaceDefaults = mkOption {
         default = null;

nixos/modules/services/networking/bind.nix

@@ -68,12 +68,7 @@ in
 
     services.bind = {
 
-      enable = mkOption {
+      enable = mkEnableOption "BIND domain name server";
-        default = false;
-        description = "
-          Whether to enable BIND domain name server.
-        ";
-      };
 
       cacheNetworks = mkOption {
         default = ["127.0.0.0/24"];

nixos/modules/services/networking/bitlbee.nix

@@ -48,6 +48,7 @@ in
     services.bitlbee = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to run the BitlBee IRC to other chat network gateway.

nixos/modules/services/networking/cntlm.nix

@@ -33,12 +33,7 @@ in
 
   options.services.cntlm = {
 
-    enable = mkOption {
+    enable = mkEnableOption "cntlm, which starts a local proxy";
-      default = false;
-      description = ''
-        Whether to enable the cntlm, which start a local proxy.
-      '';
-    };
 
     username = mkOption {
       description = ''

nixos/modules/services/networking/flashpolicyd.nix

@@ -39,6 +39,7 @@ in
     services.flashpolicyd = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description =
           ''

nixos/modules/services/networking/gvpe.nix

@@ -42,12 +42,8 @@ in
 {
   options = {
     services.gvpe = {
-      enable = mkOption {
+      enable = lib.mkEnableOption "gvpe";
-        default = false;
+
-        description = ''
-          Whether to run gvpe
-        '';
-      };
       nodename = mkOption {
         default = null;
         description =''

nixos/modules/services/networking/hostapd.nix

@@ -49,6 +49,7 @@ in
     services.hostapd = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Enable putting a wireless interface into infrastructure mode,

nixos/modules/services/networking/ircd-hybrid/default.nix

@@ -36,12 +36,7 @@ in
 
     services.ircdHybrid = {
 
-      enable = mkOption {
+      enable = mkEnableOption "IRCD";
-        default = false;
-        description = "
-          Enable IRCD.
-        ";
-      };
 
       serverName = mkOption {
         default = "hades.arpa";

nixos/modules/services/networking/mailpile.nix

@@ -18,12 +18,8 @@ in
   options = {
 
     services.mailpile = {
-      enable = mkOption {
+      enable = mkEnableOption "Mailpile the mail client";
-        default = false;
+
-        description = "
-          Whether to enable Mailpile the mail client.
-        ";
-      };
       hostname = mkOption {
         default = "localhost";
         description = "Listen to this hostname or ip.";

nixos/modules/services/networking/ntp/chrony.nix

@@ -30,6 +30,7 @@ in
   options = {
     services.chrony = {
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to synchronise your machine's time using chrony.

nixos/modules/services/networking/ntp/ntpd.nix

@@ -40,6 +40,7 @@ in
     services.ntp = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to synchronise your machine's time using ntpd, as a peer in

nixos/modules/services/networking/openfire.nix

@@ -9,12 +9,7 @@ with lib;
 
     services.openfire = {
 
-      enable = mkOption {
+      enable = mkEnableOption "OpenFire XMPP server";
-        default = false;
-        description = "
-          Whether to enable OpenFire XMPP server.
-        ";
-      };
 
       usePostgreSQL = mkOption {
         default = true;

nixos/modules/services/networking/prayer.nix

@@ -41,12 +41,7 @@ in
 
     services.prayer = {
 
-      enable = mkOption {
+      enable = mkEnableOption "the prayer webmail http server";
-        default = false;
-        description = ''
-          Whether to run the prayer webmail http server.
-        '';
-      };
 
       port = mkOption {
         default = "2080";

nixos/modules/services/networking/quassel.nix

@@ -16,12 +16,7 @@ in
 
     services.quassel = {
 
-      enable = mkOption {
+      enable = mkEnableOption "the Quassel IRC client daemon";
-        default = false;
-        description = ''
-          Whether to run the Quassel IRC client daemon.
-        '';
-      };
 
       certificateFile = mkOption {
         type = types.nullOr types.str;

nixos/modules/services/networking/radvd.nix

@@ -19,6 +19,7 @@ in
   options = {
 
     services.radvd.enable = mkOption {
+      type = types.bool;
       default = false;
       description =
         ''

nixos/modules/services/networking/rdnssd.nix

@@ -17,6 +17,7 @@ in
   options = {
 
     services.rdnssd.enable = mkOption {
+      type = types.bool;
       default = false;
       #default = config.networking.enableIPv6;
       description =

nixos/modules/services/networking/sabnzbd.nix

@@ -15,10 +15,8 @@ in
 
   options = {
     services.sabnzbd = {
-      enable = mkOption {
+      enable = mkEnableOption "the sabnzbd server";
-        default = false;
+
-        description = "Whether to enable the sabnzbd server.";
-      };
       configFile = mkOption {
         default = "/var/lib/sabnzbd/sabnzbd.ini";
         description = "Path to config file.";

nixos/modules/services/networking/shairport-sync.nix

@@ -17,6 +17,7 @@ in
     services.shairport-sync = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Enable the shairport-sync daemon.

nixos/modules/services/networking/ssh/lshd.nix

@@ -19,6 +19,7 @@ in
     services.lshd = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to enable the GNU lshd SSH2 daemon, which allows

nixos/modules/services/networking/xinetd.nix

@@ -44,12 +44,7 @@ in
 
   options = {
 
-    services.xinetd.enable = mkOption {
+    services.xinetd.enable = mkEnableOption "the xinetd super-server daemon";
-      default = false;
-      description = ''
-        Whether to enable the xinetd super-server daemon.
-      '';
-    };
 
     services.xinetd.extraDefaults = mkOption {
       default = "";

nixos/modules/services/security/fprot.nix

@@ -10,12 +10,7 @@ in {
 
     services.fprot = {
       updater = {
-        enable = mkOption {
+        enable = mkEnableOption "automatic F-Prot virus definitions database updates";
-          default = false;
-          description = ''
-            Whether to enable automatic F-Prot virus definitions database updates.
-          '';
-        };
 
         productData = mkOption {
           description = ''

nixos/modules/services/system/kerberos/default.nix

@@ -51,12 +51,7 @@ in
   ###### interface
   options = {
     services.kerberos_server = {
-      enable = mkOption {
+      enable = lib.mkEnableOption "the kerberos authentification server";
-        default = false;
-        description = ''
-          Enable the kerberos authentification server.
-        '';
-      };
 
       realms = mkOption {
         type = types.attrsOf (types.submodule realm);

nixos/modules/services/system/localtime.nix

@@ -8,6 +8,7 @@ in {
   options = {
     services.localtime = {
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Enable <literal>localtime</literal>, simple daemon for keeping the system

nixos/modules/services/system/uptimed.nix

@@ -10,6 +10,7 @@ in
   options = {
     services.uptimed = {
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Enable <literal>uptimed</literal>, allowing you to track

nixos/modules/services/web-servers/jboss/default.nix

@@ -24,6 +24,7 @@ in
     services.jboss = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = "Whether to enable JBoss. WARNING : this package is outdated and is known to have vulnerabilities.";
       };

nixos/modules/services/x11/desktop-managers/enlightenment.nix

@@ -23,6 +23,7 @@ in
   options = {
 
     services.xserver.desktopManager.enlightenment.enable = mkOption {
+      type = types.bool;
       default = false;
       description = "Enable the Enlightenment desktop environment.";
     };

nixos/modules/services/x11/desktop-managers/gnome3.nix

@@ -72,6 +72,7 @@ in
 
     services.xserver.desktopManager.gnome3 = {
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = "Enable Gnome 3 desktop manager.";
       };

nixos/modules/services/x11/desktop-managers/kodi.nix

@@ -10,6 +10,7 @@ in
   options = {
     services.xserver.desktopManager.kodi = {
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = "Enable the kodi multimedia center.";
       };

nixos/modules/services/x11/display-managers/startx.nix

@@ -15,6 +15,7 @@ in
   options = {
     services.xserver.displayManager.startx = {
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to enable the dummy "startx" pseudo-display manager,

nixos/modules/services/x11/hardware/wacom.nix

@@ -15,6 +15,7 @@ in
     services.xserver.wacom = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to enable the Wacom touchscreen/digitizer/tablet.