refactor: use mkEnableOption,mkPackageOption where applicable

hosts/common/programs/firefox/default.nix

@@ -146,10 +146,8 @@ in
             default = {};
             type = types.attrsOf (types.submodule ({ name, ...}: {
               options = {
-                package = mkOption {
+                enable = mkEnableOption "enable the ${name} Firefox addon";
-                  type = types.package;
+                package = mkPackageOption pkgs.firefox-extensions name {};
-                  default = pkgs.firefox-extensions."${name}";
-                };
                 nativeMessagingHosts = mkOption {
                   type = types.listOf types.str;
                   default = [];
@@ -158,9 +156,6 @@ in
                   type = types.listOf types.str;
                   default = [];
                 };
-                enable = mkOption {
-                  type = types.bool;
-                };
               };
             }));
           };

hosts/common/programs/swayidle.nix

@@ -2,10 +2,7 @@
 let
   cfg = config.sane.programs.swayidle;
   idleAction = with lib; types.submodule ({ config, name, ... }: {
-    options.enable = mkOption {
+    options.enable = mkEnableOption "invoke ${name} when sway is idle for so long";
-      type = types.bool;
-      default = true;
-    };
     options.command = mkOption {
       type = types.str;
       default = name;

hosts/common/users/guest.nix

@@ -5,10 +5,7 @@ let
 in
 {
   options = with lib; {
-    sane.guest.enable = mkOption {
+    sane.guest.enable = mkEnableOption "enable guest account, accessible by select authorized ssh keys";
-      default = false;
-      type = types.bool;
-    };
   };
 
   config = lib.mkIf cfg.enable {

hosts/modules/nixcache.nix

@@ -21,10 +21,7 @@ let
 in
 {
   options = with lib; {
-    sane.nixcache.enable = mkOption {
+    sane.nixcache.enable = mkEnableOption "fetch binaries from and build packages on one of my other machines";
-      default = false;
-      type = types.bool;
-    };
     sane.nixcache.enable-trusted-keys = mkOption {
       default = config.sane.nixcache.enable;
       type = types.bool;

hosts/modules/roles/build-machine.nix

@@ -5,10 +5,7 @@ let
 in
 {
   options.sane.roles.build-machine = with lib; {
-    enable = mkOption {
+    enable = mkEnableOption "allow my other machines to dispatch build jobs to this one";
-      type = types.bool;
-      default = false;
-    };
   };
 
   config = lib.mkMerge [

hosts/modules/services/rsync-net/default.nix

@@ -14,10 +14,7 @@ let
 in
 {
   options = with lib; {
-    sane.services.rsync-net.enable = mkOption {
+    sane.services.rsync-net.enable = mkEnableOption "periodically backup data to rsync.net";
-      default = false;
-      type = types.bool;
-    };
     sane.services.rsync-net.dirs = mkOption {
       type = types.listOf types.str;
       description = ''

hosts/modules/wg-home.nix

@@ -28,10 +28,7 @@ let
 in
 {
   options = with lib; {
-    sane.services.wg-home.enable = mkOption {
+    sane.services.wg-home.enable = mkEnableOption "wireguard VPN connecting my devices to eachother";
-      type = types.bool;
-      default = false;
-    };
     sane.services.wg-home.visibleToWan = mkOption {
       type = types.bool;
       default = false;

modules/persist/default.nix

@@ -165,10 +165,7 @@ let
 in
 {
   options = {
-    sane.persist.enable = mkOption {
+    sane.persist.enable = mkEnableOption "selectively persist data to disk";
-      default = false;
-      type = types.bool;
-    };
     sane.persist.sys = mkOption {
       description = "directories (or files) to persist to disk, relative to the fs root /";
       default = {};

modules/services/dropbear.nix

@@ -5,16 +5,8 @@ in
 {
   options = {
     sane.services.dropbear = with lib; {
-      enable = mkOption {
+      enable = mkEnableOption "dropbear SSH server";
-        default = false;
+      package = mkPackageOption pkgs "dropbear" {};
-        type = types.bool;
-      };
-
-      package = mkOption {
-        type = types.package;
-        default = pkgs.dropbear;
-        defaultText = literalExpression "pkgs.dropbear";
-      };
 
       port = mkOption {
         type = types.port;

modules/services/dyn-dns.nix

@@ -13,10 +13,7 @@ in
 {
   options = {
     sane.services.dyn-dns = {
-      enable = mkOption {
+      enable = mkEnableOption "keep track of the public WAN address of this machine, as viewed externally";
-        default = false;
-        type = types.bool;
-      };
 
       ipPath = mkOption {
         default = "/var/lib/uninsane/wan.txt";

modules/services/eg25-manager.nix

@@ -13,10 +13,7 @@ in
 {
   options.sane.services.eg25-manager = with lib; {
     enable = mkEnableOption "Quectel EG25 modem manager service";
-    package = mkOption {
+    package = mkPackageOption pkgs "eg25-manager" {};
-      type = types.package;
-      default = pkgs.eg25-manager;
-    };
   };
   config = lib.mkIf cfg.enable {
     # eg25-manager package ships udev rules *and* a systemd service.

modules/services/hickory-dns/default.nix

@@ -166,10 +166,7 @@ in
 {
   options = with lib; {
     sane.services.hickory-dns = {
-      enable = mkOption {
+      enable = mkEnableOption "hickory DNS server";
-        default = false;
-        type = types.bool;
-      };
       asSystemResolver = mkOption {
         default = false;
         type = types.bool;

modules/services/kiwix-serve.nix

@@ -7,18 +7,8 @@ in
 {
   options = {
     sane.services.kiwix-serve = {
-      enable = mkOption {
+      enable = mkEnableOption "serve .zim files (like Wikipedia archives) with kiwix";
-        default = false;
+      package = mkPackageOption pkgs "kiwix-tools" {};
-        type = types.bool;
-      };
-      package = mkOption {
-        type = types.package;
-        default = pkgs.kiwix-tools;
-        defaultText = literalExpression "pkgs.kiwix-tools";
-        description = lib.mdDoc ''
-          The package that provides `bin/kiwix-serve`.
-        '';
-      };
       port = mkOption {
         type = types.port;
         default = 80;

modules/wowlan.nix

@@ -117,10 +117,7 @@ let
 in
 {
   options = with lib; {
-    sane.wowlan.enable = mkOption {
+    sane.wowlan.enable = mkEnableOption "Wake on Wireless LAN packets";
-      default = false;
-      type = types.bool;
-    };
     sane.wowlan.patterns = mkOption {
       default = [];
       type = types.listOf patternOpts;