treewide: use mkEnableOption in nixos modules

nixos/modules/hardware/brillo.nix

@@ -8,13 +8,12 @@ in
   options = {
     hardware.brillo = {
       enable = mkEnableOption (lib.mdDoc ''
-        Enable brillo in userspace.
+        brillo in userspace.
-        This will allow brightness control from users in the video group.
+        This will allow brightness control from users in the video group
       '');
     };
   };
 
-
   config = mkIf cfg.enable {
     services.udev.packages = [ pkgs.brillo ];
     environment.systemPackages = [ pkgs.brillo ];

nixos/modules/hardware/ubertooth.nix

@@ -10,7 +10,7 @@ let
   };
 in {
   options.hardware.ubertooth = {
-    enable = mkEnableOption (lib.mdDoc "Enable the Ubertooth software and its udev rules.");
+    enable = mkEnableOption (lib.mdDoc "Ubertooth software and its udev rules");
 
     group = mkOption {
       type = types.str;

nixos/modules/hardware/wooting.nix

@@ -3,7 +3,7 @@
 with lib;
 {
   options.hardware.wooting.enable =
-    mkEnableOption (lib.mdDoc "Enable support for Wooting keyboards");
+    mkEnableOption (lib.mdDoc "support for Wooting keyboards");
 
   config = mkIf config.hardware.wooting.enable {
     environment.systemPackages = [ pkgs.wootility ];

nixos/modules/programs/kclock.nix

@@ -4,7 +4,7 @@ let
   cfg = config.programs.kclock;
   kclockPkg = pkgs.libsForQt5.kclock;
 in {
-  options.programs.kclock = { enable = mkEnableOption (lib.mdDoc "Enable KClock"); };
+  options.programs.kclock = { enable = mkEnableOption (lib.mdDoc "KClock"); };
 
   config = mkIf cfg.enable {
     services.dbus.packages = [ kclockPkg ];

nixos/modules/services/cluster/kubernetes/flannel.nix

@@ -12,7 +12,7 @@ in
 {
   ###### interface
   options.services.kubernetes.flannel = {
-    enable = mkEnableOption (lib.mdDoc "enable flannel networking");
+    enable = mkEnableOption (lib.mdDoc "flannel networking");
   };
 
   ###### implementation

nixos/modules/services/computing/foldingathome/client.nix

@@ -18,7 +18,7 @@ in
     '')
   ];
   options.services.foldingathome = {
-    enable = mkEnableOption (lib.mdDoc "Enable the Folding@home client");
+    enable = mkEnableOption (lib.mdDoc "Folding@home client");
 
     package = mkOption {
       type = types.package;

nixos/modules/services/databases/couchdb.nix

@@ -34,13 +34,7 @@ in {
 
     services.couchdb = {
 
-      enable = mkOption {
+      enable = mkEnableOption (lib.mdDoc "CouchDB Server");
-        type = types.bool;
-        default = false;
-        description = lib.mdDoc ''
-          Whether to run CouchDB Server.
-        '';
-      };
 
       package = mkOption {
         type = types.package;

nixos/modules/services/databases/opentsdb.nix

@@ -15,13 +15,7 @@ in {
 
     services.opentsdb = {
 
-      enable = mkOption {
+      enable = mkEnableOption (lib.mdDoc "OpenTSDB");
-        type = types.bool;
-        default = false;
-        description = lib.mdDoc ''
-          Whether to run OpenTSDB.
-        '';
-      };
 
       package = mkOption {
         type = types.package;

nixos/modules/services/home-automation/zigbee2mqtt.nix

@@ -18,7 +18,7 @@ in
   ];
 
   options.services.zigbee2mqtt = {
-    enable = mkEnableOption (lib.mdDoc "enable zigbee2mqtt service");
+    enable = mkEnableOption (lib.mdDoc "zigbee2mqtt service");
 
     package = mkOption {
       description = lib.mdDoc "Zigbee2mqtt package to use";

nixos/modules/services/logging/fluentd.nix

@@ -12,11 +12,7 @@ in {
   options = {
 
     services.fluentd = {
-      enable = mkOption {
+      enable = mkEnableOption (lib.mdDoc "fluentd");
-        type = types.bool;
-        default = false;
-        description = lib.mdDoc "Whether to enable fluentd.";
-      };
 
       config = mkOption {
         type = types.lines;

nixos/modules/services/logging/logcheck.nix

@@ -109,13 +109,7 @@ in
 {
   options = {
     services.logcheck = {
-      enable = mkOption {
+      enable = mkEnableOption (lib.mdDoc "logcheck cron job");
-        default = false;
-        type = types.bool;
-        description = lib.mdDoc ''
-          Enable the logcheck cron job.
-        '';
-      };
 
       user = mkOption {
         default = "logcheck";

nixos/modules/services/misc/exhibitor.nix

@@ -68,13 +68,8 @@ in
 {
   options = {
     services.exhibitor = {
-      enable = mkOption {
+      enable = mkEnableOption (lib.mdDoc "exhibitor server");
-        type = types.bool;
+
-        default = false;
-        description = lib.mdDoc ''
-          Whether to enable the exhibitor server.
-        '';
-      };
       # See https://github.com/soabase/exhibitor/wiki/Running-Exhibitor for what these mean
       # General options for any type of config
       port = mkOption {

nixos/modules/services/misc/gollum.nix

@@ -8,11 +8,7 @@ in
 
 {
   options.services.gollum = {
-    enable = mkOption {
+    enable = mkEnableOption (lib.mdDoc "Gollum service");
-      type = types.bool;
-      default = false;
-      description = lib.mdDoc "Enable the Gollum service.";
-    };
 
     address = mkOption {
       type = types.str;

nixos/modules/services/misc/zookeeper.nix

@@ -24,11 +24,7 @@ let
 in {
 
   options.services.zookeeper = {
-    enable = mkOption {
+    enable = mkEnableOption (lib.mdDoc "Zookeeper");
-      description = lib.mdDoc "Whether to enable Zookeeper.";
-      default = false;
-      type = types.bool;
-    };
 
     port = mkOption {
       description = lib.mdDoc "Zookeeper Client port.";

nixos/modules/services/monitoring/arbtt.nix

@@ -7,13 +7,7 @@ let
 in {
   options = {
     services.arbtt = {
-      enable = mkOption {
+      enable = mkEnableOption (lib.mdDoc "Arbtt statistics capture service");
-        type = types.bool;
-        default = false;
-        description = lib.mdDoc ''
-          Enable the arbtt statistics capture service.
-        '';
-      };
 
       package = mkOption {
         type = types.package;

nixos/modules/services/monitoring/bosun.nix

@@ -22,13 +22,7 @@ in {
 
     services.bosun = {
 
-      enable = mkOption {
+      enable = mkEnableOption (lib.mdDoc "bosun");
-        type = types.bool;
-        default = false;
-        description = lib.mdDoc ''
-          Whether to run bosun.
-        '';
-      };
 
       package = mkOption {
         type = types.package;

nixos/modules/services/monitoring/cadvisor.nix

@@ -8,11 +8,7 @@ let
 in {
   options = {
     services.cadvisor = {
-      enable = mkOption {
+      enable = mkEnableOption (lib.mdDoc "Cadvisor service");
-        default = false;
-        type = types.bool;
-        description = lib.mdDoc "Whether to enable cadvisor service.";
-      };
 
       listenAddress = mkOption {
         default = "127.0.0.1";

nixos/modules/services/monitoring/datadog-agent.nix

@@ -49,13 +49,7 @@ let
   };
 in {
   options.services.datadog-agent = {
-    enable = mkOption {
+    enable = mkEnableOption (lib.mdDoc "Datadog-agent v7 monitoring service");
-      description = lib.mdDoc ''
-        Whether to enable the datadog-agent v7 monitoring service
-      '';
-      default = false;
-      type = types.bool;
-    };
 
     package = mkOption {
       default = pkgs.datadog-agent;

nixos/modules/services/monitoring/heapster.nix

@@ -6,11 +6,7 @@ let
   cfg = config.services.heapster;
 in {
   options.services.heapster = {
-    enable = mkOption {
+    enable = mkEnableOption (lib.mdDoc "Heapster monitoring");
-      description = lib.mdDoc "Whether to enable heapster monitoring";
-      default = false;
-      type = types.bool;
-    };
 
     source = mkOption {
       description = lib.mdDoc "Heapster metric source";

nixos/modules/services/monitoring/prometheus/default.nix

@@ -1563,13 +1563,7 @@ in
 
   options.services.prometheus = {
 
-    enable = mkOption {
+    enable = mkEnableOption (lib.mdDoc "Prometheus monitoring daemon");
-      type = types.bool;
-      default = false;
-      description = lib.mdDoc ''
-        Enable the Prometheus monitoring daemon.
-      '';
-    };
 
     package = mkOption {
       type = types.package;

nixos/modules/services/monitoring/riemann.nix

@@ -27,13 +27,8 @@ in {
   options = {
 
     services.riemann = {
-      enable = mkOption {
+      enable = mkEnableOption (lib.mdDoc "Riemann network monitoring daemon");
-        type = types.bool;
+
-        default = false;
-        description = lib.mdDoc ''
-          Enable the Riemann network monitoring daemon.
-        '';
-      };
       config = mkOption {
         type = types.lines;
         description = lib.mdDoc ''

nixos/modules/services/network-filesystems/samba-wsdd.nix

@@ -9,7 +9,7 @@ in {
   options = {
     services.samba-wsdd = {
       enable = mkEnableOption (lib.mdDoc ''
-        Enable Web Services Dynamic Discovery host daemon. This enables (Samba) hosts, like your local NAS device,
+        Web Services Dynamic Discovery host daemon. This enables (Samba) hosts, like your local NAS device,
         to be found by Web Service Discovery Clients like Windows.
 
         ::: {.note}

nixos/modules/services/networking/magic-wormhole-mailbox-server.nix

@@ -9,7 +9,7 @@ let
 in
 {
   options.services.magic-wormhole-mailbox-server = {
-    enable = mkEnableOption (lib.mdDoc "Enable Magic Wormhole Mailbox Server");
+    enable = mkEnableOption (lib.mdDoc "Magic Wormhole Mailbox Server");
   };
 
   config = mkIf cfg.enable {

nixos/modules/services/networking/mozillavpn.nix

@@ -1,13 +1,8 @@
 { config, lib, pkgs, ... }:
 
 {
-  options.services.mozillavpn.enable = lib.mkOption {
+  options.services.mozillavpn.enable =
-    type = lib.types.bool;
+    lib.mkEnableOption (lib.mdDoc "Mozilla VPN daemon");
-    default = false;
-    description = lib.mdDoc ''
-      Enable the Mozilla VPN daemon.
-    '';
-  };
 
   config = lib.mkIf config.services.mozillavpn.enable {
     environment.systemPackages = [ pkgs.mozillavpn ];

nixos/modules/services/networking/networkmanager.nix

@@ -365,7 +365,7 @@ in {
           If you enable this option the
           `networkmanager_strongswan` plugin will be added to
           the {option}`networking.networkmanager.plugins` option
-          so you don't need to to that yourself.
+          so you don't need to do that yourself.
         '';
       };
 

nixos/modules/services/networking/onedrive.nix

@@ -26,11 +26,7 @@ in {
   ### Interface
 
   options.services.onedrive = {
-    enable = lib.mkOption {
+     enable = lib.mkEnableOption (lib.mdDoc "OneDrive service");
-      type = lib.types.bool;
-      default = false;
-      description = lib.mdDoc "Enable OneDrive service";
-    };
 
      package = lib.mkOption {
        type = lib.types.package;

nixos/modules/services/networking/owamp.nix

@@ -10,7 +10,7 @@ in
   ###### interface
 
   options = {
-    services.owamp.enable = mkEnableOption (lib.mdDoc "Enable OWAMP server");
+    services.owamp.enable = mkEnableOption (lib.mdDoc "OWAMP server");
   };
 
 

nixos/modules/services/networking/polipo.nix

@@ -23,11 +23,7 @@ in
 
     services.polipo = {
 
-      enable = mkOption {
+      enable = mkEnableOption (lib.mdDoc "polipo caching web proxy");
-        type = types.bool;
-        default = false;
-        description = lib.mdDoc "Whether to run the polipo caching web proxy.";
-      };
 
       proxyAddress = mkOption {
         type = types.str;

nixos/modules/services/networking/smokeping.nix

@@ -49,11 +49,8 @@ in
 {
   options = {
     services.smokeping = {
-      enable = mkOption {
+      enable = mkEnableOption (lib.mdDoc "smokeping service");
-        type = types.bool;
+
-        default = false;
-        description = lib.mdDoc "Enable the smokeping service";
-      };
       alertConfig = mkOption {
         type = types.lines;
         default = ''

nixos/modules/services/web-apps/peertube.nix

@@ -75,7 +75,7 @@ let
 
 in {
   options.services.peertube = {
-    enable = lib.mkEnableOption (lib.mdDoc "Enable Peertube’s service");
+    enable = lib.mkEnableOption (lib.mdDoc "Peertube");
 
     user = lib.mkOption {
       type = lib.types.str;

nixos/modules/services/x11/clight.nix

@@ -28,13 +28,7 @@ let
       cfg.settings));
 in {
   options.services.clight = {
-    enable = mkOption {
+    enable = mkEnableOption (lib.mdDoc "clight");
-      type = types.bool;
-      default = false;
-      description = lib.mdDoc ''
-        Whether to enable clight or not.
-      '';
-    };
 
     temperature = {
       day = mkOption {