diff --git a/modules/system/devices/networking/wireguard/client/default.nix b/modules/system/devices/networking/wireguard/client/default.nix
index 6bbe46d..965dbc0 100644
--- a/modules/system/devices/networking/wireguard/client/default.nix
+++ b/modules/system/devices/networking/wireguard/client/default.nix
@@ -1,9 +1,6 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
-  options.system.wireguard.client.enable = lib.mkOption {
-    type = lib.types.bool;
-    default = false;
-  };
+  options.system.wireguard.client.enable = lib.mkEnableOption "Enable the Wireguard client";
 
   config = lib.mkIf config.system.wireguard.client.enable {
     networking = {
diff --git a/modules/system/devices/networking/wireguard/server/default.nix b/modules/system/devices/networking/wireguard/server/default.nix
index 72fc382..a36f83e 100644
--- a/modules/system/devices/networking/wireguard/server/default.nix
+++ b/modules/system/devices/networking/wireguard/server/default.nix
@@ -1,9 +1,6 @@
-{ lib, config, ... }:
+{ config, lib, ... }:
 {
-  options.system.wireguard.server.enable = lib.mkOption {
-    type = lib.types.bool;
-    default = false;
-  };
+  options.system.wireguard.server.enable = lib.mkEnableOption "Enable the Wireguard server";
 
   config = lib.mkIf config.system.wireguard.server.enable {
     networking = {
diff --git a/modules/system/devices/networking/wireless/default.nix b/modules/system/devices/networking/wireless/default.nix
index 63c1201..cac36dc 100644
--- a/modules/system/devices/networking/wireless/default.nix
+++ b/modules/system/devices/networking/wireless/default.nix
@@ -1,9 +1,6 @@
 { config, lib, pkgs, ... }:
 {
-  options.system.wireless.enable = lib.mkOption {
-    type = lib.types.bool;
-    default = true;
-  };
+  options.system.wireless.enable = lib.mkEnableOption "Enable wireless stack";
 
   config = lib.mkIf config.system.wireless.enable {
     networking.wireless.iwd.enable = true;
diff --git a/modules/system/devices/udev/default.nix b/modules/system/devices/udev/default.nix
index 6297ea2..3c18a92 100644
--- a/modules/system/devices/udev/default.nix
+++ b/modules/system/devices/udev/default.nix
@@ -1,17 +1,15 @@
 { pkgs, ... }:
 {
-  services.udev = {
-    packages = [ 
-      (pkgs.writeTextFile {
-        name = "10-oculus.rules";
-        text = ''KERNEL=="hidraw*", ATTRS{idVendor}=="0e6f", ATTRS{idProduct}=="0184", MODE="0660", TAG+="uaccess"'';
-        destination = "/etc/udev/rules.d/10-oculus.rules";
-      })
-      (pkgs.writeTextFile {
-        name = "10-pdp.rules";
-        text = ''SUBSYSTEM=="usb", ATTR{idVendor}=="2833", MODE="0666"'';
-        destination = "/etc/udev/rules.d/10-pdp.rules";
-      })
-    ];
-  };
+  services.udev.packages = [
+    (pkgs.writeTextFile {
+      name = "10-oculus.rules";
+      text = ''KERNEL=="hidraw*", ATTRS{idVendor}=="0e6f", ATTRS{idProduct}=="0184", MODE="0660", TAG+="uaccess"'';
+      destination = "/etc/udev/rules.d/10-oculus.rules";
+    })
+    (pkgs.writeTextFile {
+      name = "10-pdp.rules";
+      text = ''SUBSYSTEM=="usb", ATTR{idVendor}=="2833", MODE="0666"'';
+      destination = "/etc/udev/rules.d/10-pdp.rules";
+    })
+  ];
 }
diff --git a/modules/system/devices/video/nouveau/default.nix b/modules/system/devices/video/nouveau/default.nix
index d093152..0d89c12 100644
--- a/modules/system/devices/video/nouveau/default.nix
+++ b/modules/system/devices/video/nouveau/default.nix
@@ -1,9 +1,6 @@
-{ lib, pkgs, config, ... }:
+{ config, lib, pkgs, ... }:
 {
-  options.system.video.nouveau.enable = lib.mkOption {
-    type = lib.types.bool;
-    default = false;
-  };
+  options.system.video.nouveau.enable = lib.mkEnableOption "Enable the Nouveau graphics stack";
 
   config = lib.mkIf config.system.video.nouveau.enable {
     services.xserver.videoDrivers = [ "nouveau" ];
diff --git a/modules/system/devices/video/nvidia/default.nix b/modules/system/devices/video/nvidia/default.nix
index 06b42e1..ae1e7d9 100644
--- a/modules/system/devices/video/nvidia/default.nix
+++ b/modules/system/devices/video/nvidia/default.nix
@@ -1,9 +1,6 @@
-{ lib, pkgs, config, ... }:
+{ config, lib, pkgs, ... }:
 {
-  options.system.video.nvidia.enable = lib.mkOption {
-    type = lib.types.bool;
-    default = false;
-  };
+  options.system.video.nvidia.enable = lib.mkEnableOption "Enable the Nvidia graphics stack";
 
   config = lib.mkIf config.system.video.nvidia.enable {
     hardware = {
diff --git a/modules/system/services/general/libvirtd/default.nix b/modules/system/services/general/libvirtd/default.nix
index 3576ae9..0759b77 100644
--- a/modules/system/services/general/libvirtd/default.nix
+++ b/modules/system/services/general/libvirtd/default.nix
@@ -1,12 +1,6 @@
 { config, lib, pkgs, ... }:
 {
-  options.system.libvirtd = {
-    enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      description = "Enable libvirtd and such";
-    };
-  };
+  options.system.libvirtd.enable = lib.mkEnableOption "Enable libvirtd services";
 
   config = lib.mkIf config.system.libvirtd.enable {
     virtualisation = {
diff --git a/modules/system/services/general/portals/default.nix b/modules/system/services/general/portals/default.nix
index 578b25e..8ce9e7d 100644
--- a/modules/system/services/general/portals/default.nix
+++ b/modules/system/services/general/portals/default.nix
@@ -1,18 +1,16 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
 {
-  config = lib.mkIf config.system.desktop.enable {
-    xdg.portal = {
-      wlr = {
-        enable = lib.mkForce true;
-        settings.screencast = {
-          max_fps = 60;
-          chooser_type = "simple";
-          chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or -B 00000066 -b 00000099";
-        };
+  xdg.portal = lib.mkIf config.system.desktop.enable {
+    wlr = {
+      enable = lib.mkForce true;
+      settings.screencast = {
+        max_fps = 60;
+        chooser_type = "simple";
+        chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or -B 00000066 -b 00000099";
       };
-      extraPortals = with pkgs; [
-        xdg-desktop-portal-gnome
-      ];
     };
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-gnome
+    ];
   };
 }