Simplify more options

modules/system/devices/networking/wireguard/client/default.nix

@@ -1,9 +1,6 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
-  options.system.wireguard.client.enable = lib.mkOption {
+  options.system.wireguard.client.enable = lib.mkEnableOption "Enable the Wireguard client";
-    type = lib.types.bool;
-    default = false;
-  };
 
   config = lib.mkIf config.system.wireguard.client.enable {
     networking = {

modules/system/devices/networking/wireguard/server/default.nix

@@ -1,9 +1,6 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
-  options.system.wireguard.server.enable = lib.mkOption {
+  options.system.wireguard.server.enable = lib.mkEnableOption "Enable the Wireguard server";
-    type = lib.types.bool;
-    default = false;
-  };
 
   config = lib.mkIf config.system.wireguard.server.enable {
     networking = {

modules/system/devices/networking/wireless/default.nix

@@ -1,9 +1,6 @@
 { config, lib, pkgs, ... }:
 {
-  options.system.wireless.enable = lib.mkOption {
+  options.system.wireless.enable = lib.mkEnableOption "Enable wireless stack";
-    type = lib.types.bool;
-    default = true;
-  };
 
   config = lib.mkIf config.system.wireless.enable {
     networking.wireless.iwd.enable = true;

modules/system/devices/udev/default.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }:
 {
-  services.udev = {
+  services.udev.packages = [
-    packages = [ 
     (pkgs.writeTextFile {
       name = "10-oculus.rules";
       text = ''KERNEL=="hidraw*", ATTRS{idVendor}=="0e6f", ATTRS{idProduct}=="0184", MODE="0660", TAG+="uaccess"'';
@@ -13,5 +12,4 @@
       destination = "/etc/udev/rules.d/10-pdp.rules";
     })
   ];
-  };
 }

modules/system/devices/video/nouveau/default.nix

@@ -1,9 +1,6 @@
-{ lib, pkgs, config, ... }:
+{ config, lib, pkgs, ... }:
 {
-  options.system.video.nouveau.enable = lib.mkOption {
+  options.system.video.nouveau.enable = lib.mkEnableOption "Enable the Nouveau graphics stack";
-    type = lib.types.bool;
-    default = false;
-  };
 
   config = lib.mkIf config.system.video.nouveau.enable {
     services.xserver.videoDrivers = [ "nouveau" ];

modules/system/devices/video/nvidia/default.nix

@@ -1,9 +1,6 @@
-{ lib, pkgs, config, ... }:
+{ config, lib, pkgs, ... }:
 {
-  options.system.video.nvidia.enable = lib.mkOption {
+  options.system.video.nvidia.enable = lib.mkEnableOption "Enable the Nvidia graphics stack";
-    type = lib.types.bool;
-    default = false;
-  };
 
   config = lib.mkIf config.system.video.nvidia.enable {
     hardware = {

modules/system/services/general/libvirtd/default.nix

@@ -1,12 +1,6 @@
 { config, lib, pkgs, ... }:
 {
-  options.system.libvirtd = {
+  options.system.libvirtd.enable = lib.mkEnableOption "Enable libvirtd services";
-    enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      description = "Enable libvirtd and such";
-    };
-  };
 
   config = lib.mkIf config.system.libvirtd.enable {
     virtualisation = {

modules/system/services/general/portals/default.nix

@@ -1,7 +1,6 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
 {
-  config = lib.mkIf config.system.desktop.enable {
+  xdg.portal = lib.mkIf config.system.desktop.enable {
-    xdg.portal = {
     wlr = {
       enable = lib.mkForce true;
       settings.screencast = {
@@ -14,5 +13,4 @@
       xdg-desktop-portal-gnome
     ];
   };
-  };
 }