Miscellaneous: Don't use mkEnableOption

nixos/modules/config/pulseaudio.nix

@@ -163,18 +163,36 @@ in {
       };
 
       zeroconf = {
-        discovery.enable =
-          mkEnableOption "discovery of pulseaudio sinks in the local network";
-        publish.enable =
-          mkEnableOption "publishing the pulseaudio sink in the local network";
+        discovery.enable = mkOption {
+          default = false;
+          example = true;
+          type = types.bool;
+          description = "Whether to enable discovery of pulseaudio sinks in the local network.";
+        };
+        publish.enable = mkOption {
+          default = false;
+          example = true;
+          type = types.bool;
+          description = "Whether to enable publishing the pulseaudio sink in the local network.";
+        };
       };
 
       # TODO: enable by default?
       tcp = {
-        enable = mkEnableOption "tcp streaming support";
+        enable = mkOption {
+          default = false;
+          example = true;
+          type = types.bool;
+          description = "Whether to enable tcp streaming support.";
+        };
 
         anonymousClients = {
-          allowAll = mkEnableOption "all anonymous clients to stream to the server";
+          allowAll = mkOption {
+            default = false;
+            example = true;
+            type = types.bool;
+            description = "Whether to enable all anonymous clients to stream to the server.";
+          };
           allowedIpRanges = mkOption {
             type = types.listOf types.str;
             default = [];

nixos/modules/hardware/ksm.nix

@@ -1,7 +1,12 @@
 { config, lib, ... }:
 
 {
-  options.hardware.enableKSM = lib.mkEnableOption "Kernel Same-Page Merging";
+  options.hardware.enableKSM = lib.mkOption {
+    default = false;
+    example = true;
+    type = lib.types.bool;
+    description = "Whether to enable Kernel Same-Page Merging.";
+  };
 
   config = lib.mkIf config.hardware.enableKSM {
     systemd.services.enable-ksm = {

nixos/modules/hardware/video/webcam/facetimehd.nix

@@ -12,7 +12,12 @@ in
 
 {
 
-  options.hardware.facetimehd.enable = mkEnableOption "facetimehd kernel module";
+  options.hardware.facetimehd.enable = mkOption {
+    default = false;
+    example = true;
+    type = types.bool;
+    description = "Whether to enable facetimehd kernel module.";
+  };
 
   config = mkIf cfg.enable {
 

nixos/modules/programs/kbdlight.nix

@@ -7,7 +7,12 @@ let
 
 in
 {
-  options.programs.kbdlight.enable = mkEnableOption "kbdlight";
+  options.programs.kbdlight.enable = mkOption {
+    default = false;
+    example = true;
+    type = types.bool;
+    description = "Whether to enable kbdlight.";
+  };
 
   config = mkIf cfg.enable {
     environment.systemPackages = [ pkgs.kbdlight ];

nixos/modules/programs/tmux.nix

@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
 let
-  inherit (lib) mkOption mkEnableOption mkIf mkMerge types;
+  inherit (lib) mkOption mkIf mkMerge types;
 
   cfg = config.programs.tmux;
 
@@ -61,7 +61,14 @@ in {
   options = {
     programs.tmux = {
 
-      enable = mkEnableOption "<command>tmux</command> - a <command>screen</command> replacement.";
+      enable = mkOption {
+        default = false;
+        example = true;
+        type = types.bool;
+        description = ''
+          Whether to enable <command>tmux</command> - a <command>screen</command> replacement.
+        '';
+      };
 
       aggressiveResize = mkOption {
         default = false;

nixos/modules/security/grsecurity.nix

@@ -27,7 +27,12 @@ in
 
   options.security.grsecurity = {
 
-    enable = mkEnableOption "grsecurity/PaX";
+    enable = mkOption {
+      default = false;
+      example = true;
+      type = types.bool;
+      description = "Whether to enable grsecurity/PaX.";
+    };
 
     lockTunables = mkOption {
       type = types.bool;

nixos/modules/services/audio/icecast.nix

@@ -44,7 +44,12 @@ in {
 
     services.icecast = {
 
-      enable = mkEnableOption "Icecast server";
+      enable = mkOption {
+        default = false;
+        example = true;
+        type = types.bool;
+        description = "Whether to enable Icecast server.";
+      };
 
       hostname = mkOption {
         type = types.str;

nixos/modules/services/audio/mopidy.nix

@@ -21,7 +21,12 @@ in {
 
     services.mopidy = {
 
-      enable = mkEnableOption "Mopidy, a music player daemon";
+      enable = mkOption {
+        default = false;
+        example = true;
+        type = types.bool;
+        description = "Whether to enable Mopidy, a music player daemon.";
+      };
 
       dataDir = mkOption {
         default = "/var/lib/mopidy";

nixos/modules/services/audio/squeezelite.nix

@@ -15,7 +15,14 @@ in {
 
     services.squeezelite= {
 
-      enable = mkEnableOption "Squeezelite, a software Squeezebox emulator";
+      enable = mkOption {
+        default = false;
+        example = true;
+        type = types.bool;
+        description = ''
+          Whether to enable Squeezelite, a software Squeezebox emulator.
+        '';
+      };
 
       dataDir = mkOption {
         default = "/var/lib/squeezelite";

nixos/modules/services/audio/ympd.nix

@@ -12,7 +12,12 @@ in {
 
     services.ympd = {
 
-      enable = mkEnableOption "ympd, the MPD Web GUI";
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable ympd, the MPD Web GUI.";
+        example = true;
+      };
 
       webPort = mkOption {
         type = types.string;

nixos/modules/services/backup/rsnapshot.nix

@@ -19,7 +19,12 @@ in
 {
   options = {
     services.rsnapshot = {
-      enable = mkEnableOption "rsnapshot backups";
+      enable = mkOption {
+        description = "Whether to enable rsnapshot backups.";
+        default = false;
+        example = true;
+        type = types.bool;
+      };
       enableManualRsnapshot = mkOption {
         description = "Whether to enable manual usage of the rsnapshot command with this module.";
         default = true;

nixos/modules/services/backup/znapzend.nix

@@ -8,7 +8,12 @@ in
 {
   options = {
     services.znapzend = {
-      enable = mkEnableOption "ZnapZend daemon";
+      enable = mkOption {
+        default = false;
+        example = true;
+        type = types.bool;
+        description = "Whether to enable ZnapZend daemon.";
+      };
     };
   };
 

nixos/modules/services/cluster/kubernetes.nix

@@ -391,7 +391,12 @@ in {
     };
 
     kube2sky = {
-      enable = mkEnableOption "Whether to enable kube2sky dns service.";
+      enable = mkOption {
+        description = "Whether to enable kube2sky dns service.";
+        default = false;
+        example = true;
+        type = types.bool;
+      };
 
       domain = mkOption  {
         description = "Kuberntes kube2sky domain under which all DNS names will be hosted.";

nixos/modules/services/computing/slurm/slurm.nix

@@ -25,12 +25,22 @@ in
     services.slurm = {
 
       server = {
-        enable = mkEnableOption "slurm control daemon";
+        enable = mkOption {
+          type = types.bool;
+          default = false;
+          example = true;
+          description = "Whether to enable slurm control daemon.";
+        };
 
       };
 
       client = {
-        enable = mkEnableOption "slurm rlient daemon";
+        enable = mkOption {
+          type = types.bool;
+          default = false;
+          example = true;
+          description = "Whether to enable slurm rlient daemon.";
+        };
 
       };
 

nixos/modules/services/computing/torque/mom.nix

@@ -17,7 +17,12 @@ in
   options = {
 
     services.torque.mom = {
-      enable = mkEnableOption "torque computing node";
+      enable = mkOption {
+        default = false;
+        example = true;
+        type = types.bool;
+        description = "Whether to enable torque computing node.";
+      };
 
       serverNode = mkOption {
         type = types.str;

nixos/modules/services/computing/torque/server.nix

@@ -11,7 +11,12 @@ in
 
     services.torque.server = {
 
-      enable = mkEnableOption "torque server";
+      enable = mkOption {
+        default = false;
+        example = true;
+        type = types.bool;
+        description = "Whether to enable torque server.";
+      };
 
     };
 

nixos/modules/services/continuous-integration/buildkite-agent.nix

@@ -18,7 +18,12 @@ in
 {
   options = {
     services.buildkite-agent = {
-      enable = mkEnableOption "buildkite-agent";
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        example = true;
+        description = "Whether to enable buildkite-agent.";
+      };
 
       token = mkOption {
         type = types.str;

nixos/modules/services/continuous-integration/gocd-agent/default.nix

@@ -7,7 +7,12 @@ let
 in {
   options = {
     services.gocd-agent = {
-      enable = mkEnableOption "gocd-agent";
+      enable = mkOption {
+        default = false;
+        example = true;
+        type = types.bool;
+        description = "Whether to enable gocd-agent.";
+      };
 
       user = mkOption {
         default = "gocd-agent";

nixos/modules/services/continuous-integration/gocd-server/default.nix

@@ -7,7 +7,12 @@ let
 in {
   options = {
     services.gocd-server = {
-      enable = mkEnableOption "gocd-server";
+      enable = mkOption {
+        default = false;
+        example = true;
+        type = types.bool;
+        description = "Whether to enable gocd-server.";
+      };
 
       user = mkOption {
         default = "gocd-server";

nixos/modules/services/databases/riak.nix

@@ -16,7 +16,12 @@ in
 
     services.riak = {
 
-      enable = mkEnableOption "riak";
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        example = true;
+        description = "Whether to enable riak.";
+      };
 
       package = mkOption {
         type = types.package;

nixos/modules/services/development/hoogle.nix

@@ -14,7 +14,12 @@ let
 in {
 
   options.services.hoogle = {
-    enable = mkEnableOption "Haskell documentation server";
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      example = true;
+      description = "Whether to enable Haskell documentation server.";
+    };
 
     port = mkOption {
       type = types.int;

nixos/modules/services/games/factorio.nix

@@ -19,7 +19,12 @@ in
 {
   options = {
     services.factorio = {
-      enable = mkEnableOption name;
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        example = true;
+        description = "Whether to enable ${name}.";
+      };
       port = mkOption {
         type = types.int;
         default = 34197;

nixos/modules/services/hardware/irqbalance.nix

@@ -9,7 +9,12 @@ let
 
 in
 {
-  options.services.irqbalance.enable = mkEnableOption "irqbalance daemon";
+  options.services.irqbalance.enable = mkOption {
+    type = types.bool;
+    default = false;
+    example = true;
+    description = "Whether to enable irqbalance daemon.";
+  };
 
   config = mkIf cfg.enable {
 

nixos/modules/services/hardware/pcscd.nix

@@ -17,7 +17,12 @@ in {
   options = {
 
     services.pcscd = {
-      enable = mkEnableOption "PCSC-Lite daemon";
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        example = true;
+        description = "Whether to enable PCSC-Lite daemon.";
+      };
 
       plugins = mkOption {
         type = types.listOf types.package;