diff --git a/hosts/Dimaga/default.nix b/hosts/Dimaga/default.nix
index 31b79b2..fec6948 100644
--- a/hosts/Dimaga/default.nix
+++ b/hosts/Dimaga/default.nix
@@ -36,10 +36,6 @@ in
   networking.hostName = hostName;
 
   ###*** Configure your system below this line. ***###
-  # Set your time zone.
-  #   To see all available timezones, run `timedatectl list-timezones`.
-  time.timeZone = "America/New_York";
-
   # Build Nix packages for other hosts.
   # Runs every day at 4 AM
   systemd = {
diff --git a/hosts/Hevana/default.nix b/hosts/Hevana/default.nix
index 3010a95..2ca46aa 100644
--- a/hosts/Hevana/default.nix
+++ b/hosts/Hevana/default.nix
@@ -37,10 +37,6 @@ in
   networking.hostName = hostName;
 
   ###*** Configure your system below this line. ***###
-  # Set your time zone.
-  #   To see all available timezones, run `timedatectl list-timezones`.
-  time.timeZone = "America/New_York";
-
   # Build Nix packages for other hosts.
   # Runs every day at 4 AM
   systemd = {
@@ -87,6 +83,7 @@ in
     # Enable GPU support.
     gpu.amd.enable = true;
 
+    # Install script to get the system up and running after boot.
     packages = [ start-services ];
 
     # Enable support for primary RAID array
diff --git a/hosts/Hevana/hardware-configuration.nix b/hosts/Hevana/hardware-configuration.nix
index da4baf7..3f29c60 100644
--- a/hosts/Hevana/hardware-configuration.nix
+++ b/hosts/Hevana/hardware-configuration.nix
@@ -41,23 +41,4 @@ in
       size = 16384;
     };
   };
-
-  # Automatically scrub the RAID array monthly
-  systemd.services."raid-scrub" = {
-    description = "Periodically scrub RAID volumes for errors.";
-    serviceConfig = {
-      Type = "oneshot";
-      User = "root";
-    };
-    script = "echo check > /sys/block/md127/md/sync_action";
-  };
-  systemd.timers."raid-scrub" = {
-    description = "Periodically scrub RAID volumes for errors.";
-    wantedBy = [ "timers.target" ];
-    timerConfig = {
-      OnCalendar = "monthly";
-      Persistent = true;
-      Unit = "raid-scrub.service";
-    };
-  };
 }
diff --git a/hosts/Khanda/default.nix b/hosts/Khanda/default.nix
index 1db1b09..c4b1888 100644
--- a/hosts/Khanda/default.nix
+++ b/hosts/Khanda/default.nix
@@ -12,10 +12,6 @@ in
   networking.hostName = hostName;
 
   ###*** Configure your system below this line. ***###
-  # Set your time zone.
-  #   To see all available timezones, run `timedatectl list-timezones`.
-  time.timeZone = "America/New_York";
-
   # Configure the system.
   aux.system = {
     # Enable to allow unfree (e.g. closed source) packages.
diff --git a/hosts/Pihole/default.nix b/hosts/Pihole/default.nix
index ca46602..93d7438 100644
--- a/hosts/Pihole/default.nix
+++ b/hosts/Pihole/default.nix
@@ -12,7 +12,17 @@ in
   imports = [ ./hardware-configuration.nix ];
 
   system.stateVersion = stateVersion;
-  networking.hostName = hostName;
+  networking = {
+    hostName = hostName;
+
+    # Connect to the network automagically
+    networkmanager.enable = lib.mkForce false;
+    wireless.networks = {
+      "${config.secrets.networking.networks.home.SSID}" = {
+        psk = "${config.secrets.networking.networks.home.password}";
+      };
+    };
+  };
 
   aux.system = {
     bootloader.enable = false; # Bootloader configured in hardware-configuration.nix
@@ -30,16 +40,4 @@ in
   };
 
   nix.distributedBuilds = true;
-
-  time.timeZone = "America/New_York";
-
-  # Connect to the network automagically
-  networking = {
-    networkmanager.enable = lib.mkForce false;
-    wireless.networks = {
-      "${config.secrets.networking.networks.home.SSID}" = {
-        psk = "${config.secrets.networking.networks.home.password}";
-      };
-    };
-  };
 }
diff --git a/modules/apps/writing.nix b/modules/apps/writing.nix
index 5a76a72..9e751be 100644
--- a/modules/apps/writing.nix
+++ b/modules/apps/writing.nix
@@ -10,7 +10,7 @@ let
 in
 {
   options = {
-    aux.system.apps.writing.enable = lib.mkEnableOption (lib.mdDoc "Enables writing and editing tools");
+    aux.system.apps.writing.enable = lib.mkEnableOption "Enables writing and editing tools";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/common.nix b/modules/common.nix
index 7f254fe..ef5feb2 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -8,19 +8,12 @@
 
 {
   config = {
-    # Install ZSH for all users
-    programs.zsh.enable = true;
-    users.defaultUserShell = pkgs.zsh;
-
-    aux.system = {
-      packages = with pkgs; [
-        fastfetch # Show a neat system statistics screen when opening a terminal
-        htop
-        mdadm # RAID management
-        nh # Nix Helper: https://github.com/viperML/nh
-        zellij # Terminal multiplexer
-      ];
-    };
+    # Install base packages
+    aux.system.packages = with pkgs; [
+      fastfetch # Show a neat system statistics screen when opening a terminal
+      htop # System monitor
+      zellij # Terminal multiplexer
+    ];
 
     # Allow packages from the unstable repo by using 'pkgs.unstable'
     nixpkgs.overlays = [
@@ -33,14 +26,17 @@
     ];
 
     programs = {
+      # Install ZSH for all users
+      zsh.enable = true;
+
       # Enable NH, an alternative nixos-rebuild frontend.
+      # https://github.com/viperML/nh
       nh = {
         enable = true;
         flake = "${config.secrets.nixConfigFolder}";
       };
-      # Do some additional Nano configuration
+      # Configure nano
       nano.nanorc = ''
-        set linenumbers
         set tabsize 4
         set softwrap
         set autoindent
@@ -48,6 +44,7 @@
       '';
     };
 
-    services.fail2ban.enable = true;
+    # Set ZSH as the default shell
+    users.defaultUserShell = pkgs.zsh;
   };
 }
diff --git a/modules/module.nix.template b/modules/module.nix.template
index 0b14655..43546c9 100644
--- a/modules/module.nix.template
+++ b/modules/module.nix.template
@@ -7,7 +7,7 @@ in
 {
   options = {
     aux.system.services.myModule = {
-      enable = lib.mkEnableOption (lib.mdDoc "Enables this example module.");
+      enable = lib.mkEnableOption "Enables this example module.";
       attributes = lib.mkOption {
         default = { };
         type = lib.types.attrs;
diff --git a/modules/services/acme.nix b/modules/services/acme.nix
index 7bc9a89..4c3649f 100644
--- a/modules/services/acme.nix
+++ b/modules/services/acme.nix
@@ -6,9 +6,7 @@ in
 {
   options = {
     aux.system.services.acme = {
-      enable = lib.mkEnableOption (
-        lib.mdDoc "Enable the ACME client (for Let's Encrypt TLS certificates)."
-      );
+      enable = lib.mkEnableOption "Enable the ACME client (for Let's Encrypt TLS certificates).";
       certs = lib.mkOption {
         default = { };
         type = lib.types.attrs;
diff --git a/modules/services/airsonic.nix b/modules/services/airsonic.nix
index 1dc2476..4c5ae8a 100644
--- a/modules/services/airsonic.nix
+++ b/modules/services/airsonic.nix
@@ -10,7 +10,7 @@ in
 {
   options = {
     aux.system.services.airsonic = {
-      enable = lib.mkEnableOption (lib.mdDoc "Enables Airsonic Advanced media streaming service.");
+      enable = lib.mkEnableOption "Enables Airsonic Advanced media streaming service.";
       home = lib.mkOption {
         default = "/var/lib/airsonic";
         type = lib.types.str;
diff --git a/modules/services/autoupgrade.nix b/modules/services/autoupgrade.nix
index 66a7616..3cf0a05 100644
--- a/modules/services/autoupgrade.nix
+++ b/modules/services/autoupgrade.nix
@@ -7,7 +7,7 @@ in
 {
   options = {
     aux.system.services.autoUpgrade = {
-      enable = lib.mkEnableOption (lib.mdDoc "Enables automatic system updates.");
+      enable = lib.mkEnableOption "Enables automatic system updates.";
       branches = lib.mkOption {
         type = lib.types.attrs;
         description = "Which local and remote branches to compare.";
@@ -31,9 +31,7 @@ in
         type = lib.types.bool;
         description = "If true, the time when the service unit was last triggered is stored on disk. When the timer is activated, the service unit is triggered immediately if it would have been triggered at least once during the time when the timer was inactive. This is useful to catch up on missed runs of the service when the system was powered down.";
       };
-      pushUpdates = lib.mkEnableOption (
-        lib.mdDoc "Updates the flake.lock file and pushes it back to the repo."
-      );
+      pushUpdates = lib.mkEnableOption "Updates the flake.lock file and pushes it back to the repo.";
       user = lib.mkOption {
         type = lib.types.str;
         description = "The user who owns the configDir.";
diff --git a/modules/services/boinc.nix b/modules/services/boinc.nix
index 46eb531..e9e2256 100644
--- a/modules/services/boinc.nix
+++ b/modules/services/boinc.nix
@@ -10,9 +10,7 @@ let
 in
 {
   options = {
-    aux.system.services.boinc.enable = lib.mkEnableOption (
-      lib.mdDoc "Enables BOINC distributed computing service."
-    );
+    aux.system.services.boinc.enable = lib.mkEnableOption "Enables BOINC distributed computing service.";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix
index a54f98f..5ac4d37 100644
--- a/modules/services/forgejo.nix
+++ b/modules/services/forgejo.nix
@@ -24,7 +24,7 @@ in
 {
   options = {
     aux.system.services.forgejo = {
-      enable = lib.mkEnableOption (lib.mdDoc "Enables Forgejo Git hosting service.");
+      enable = lib.mkEnableOption "Enables Forgejo Git hosting service.";
       domain = lib.mkOption {
         default = "/var/lib/forgejo";
         type = lib.types.str;
@@ -44,7 +44,7 @@ in
         example = "https://forgejo.example.com";
       };
       actions = {
-        enable = lib.mkEnableOption (lib.mdDoc "Enables a local Forgejo Actions runner.");
+        enable = lib.mkEnableOption "Enables a local Forgejo Actions runner.";
         token = lib.mkOption {
           default = "";
           type = lib.types.str;
diff --git a/modules/services/home-assistant.nix b/modules/services/home-assistant.nix
index 0298995..64ca162 100644
--- a/modules/services/home-assistant.nix
+++ b/modules/services/home-assistant.nix
@@ -11,7 +11,7 @@ in
 {
   options = {
     aux.system.services.home-assistant = {
-      enable = lib.mkEnableOption (lib.mdDoc "Enables Home Assistant.");
+      enable = lib.mkEnableOption "Enables Home Assistant.";
       domain = lib.mkOption {
         default = "";
         type = lib.types.str;
diff --git a/modules/services/jellyfin.nix b/modules/services/jellyfin.nix
index cce83fd..1c32477 100644
--- a/modules/services/jellyfin.nix
+++ b/modules/services/jellyfin.nix
@@ -14,7 +14,7 @@ in
 {
   options = {
     aux.system.services.jellyfin = {
-      enable = lib.mkEnableOption (lib.mdDoc "Enables the Jellyfin media streaming service.");
+      enable = lib.mkEnableOption "Enables the Jellyfin media streaming service.";
       home = lib.mkOption {
         default = "/var/lib/jellyfin";
         type = lib.types.str;
diff --git a/modules/services/nginx.nix b/modules/services/nginx.nix
index 19edf58..00c0b9d 100644
--- a/modules/services/nginx.nix
+++ b/modules/services/nginx.nix
@@ -6,8 +6,8 @@ in
 {
   options = {
     aux.system.services.nginx = {
-      autostart = lib.mkEnableOption (lib.mdDoc "Whether to autostart Nginx at boot.");
-      enable = lib.mkEnableOption (lib.mdDoc "Enable the Nginx web server.");
+      autostart = lib.mkEnableOption "Whether to autostart Nginx at boot.";
+      enable = lib.mkEnableOption "Enable the Nginx web server.";
 
       virtualHosts = lib.mkOption {
         default = { };
diff --git a/modules/services/ssh.nix b/modules/services/ssh.nix
index 36eb0a1..a9487ee 100644
--- a/modules/services/ssh.nix
+++ b/modules/services/ssh.nix
@@ -6,7 +6,7 @@ in
 {
   options = {
     aux.system.services.ssh = {
-      enable = lib.mkEnableOption (lib.mdDoc "Enables SSH server.");
+      enable = lib.mkEnableOption "Enables SSH server.";
       ports = lib.mkOption {
         default = [ 22 ];
         type = lib.types.listOf lib.types.int;
diff --git a/modules/services/virtualization.nix b/modules/services/virtualization.nix
index 004c994..318ad69 100644
--- a/modules/services/virtualization.nix
+++ b/modules/services/virtualization.nix
@@ -12,16 +12,16 @@ in
 {
   options = {
     aux.system.services.virtualization = {
-      enable = lib.mkEnableOption (lib.mdDoc "Enables virtualization tools on this host.");
+      enable = lib.mkEnableOption "Enables virtualization tools on this host.";
       host = {
-        enable = lib.mkEnableOption (lib.mdDoc "Enables virtual machine hosting.");
+        enable = lib.mkEnableOption "Enables virtual machine hosting.";
         user = lib.mkOption {
           default = "";
           type = lib.types.str;
           description = "The default user to add as a KVM admin.";
         };
         vmBuilds = {
-          enable = lib.mkEnableOption (lib.mdDoc "Enables builds via `nixos-rebuild build-vm` on this host.");
+          enable = lib.mkEnableOption "Enables builds via `nixos-rebuild build-vm` on this host.";
           cores = lib.mkOption {
             type = lib.types.int;
             description = "How many cores to assign to `nixos-rebuild build-vm` builds. Defaults to 2.";
diff --git a/modules/system/bluetooth.nix b/modules/system/bluetooth.nix
index 8eecd22..c6562b3 100644
--- a/modules/system/bluetooth.nix
+++ b/modules/system/bluetooth.nix
@@ -13,7 +13,7 @@ in
 
   options = {
     aux.system.bluetooth = {
-      enable = lib.mkEnableOption (lib.mdDoc "Enables bluetooth");
+      enable = lib.mkEnableOption "Enables bluetooth.";
     };
   };
 
diff --git a/modules/system/bootloader.nix b/modules/system/bootloader.nix
index b3edd25..67967c0 100644
--- a/modules/system/bootloader.nix
+++ b/modules/system/bootloader.nix
@@ -21,8 +21,8 @@ in
         default = true;
       };
 
-      secureboot.enable = lib.mkEnableOption (lib.mdDoc "Enables Secureboot support.");
-      tpm2.enable = lib.mkEnableOption (lib.mdDoc "Enables TPM2 support.");
+      secureboot.enable = lib.mkEnableOption "Enables Secureboot support (please read the README before enabling!).";
+      tpm2.enable = lib.mkEnableOption "Enables TPM2 support.";
     };
   };
 
@@ -34,8 +34,10 @@ in
           bootspec.enable = true;
 
           # Use Lanzaboote in place of systemd-boot.
-          loader.systemd-boot.enable = false;
-          loader.efi.canTouchEfiVariables = true;
+          loader = {
+            systemd-boot.enable = false;
+            efi.canTouchEfiVariables = true;
+          };
           lanzaboote = {
             enable = true;
             pkiBundle = "/etc/secureboot";
@@ -46,9 +48,8 @@ in
       # Set up TPM if enabled. See https://wiki.nixos.org/wiki/TPM
       (lib.mkIf (cfg.tpm2.enable) {
         boot.initrd = {
-          # Enable systemd for TPM auto-unlocking
+          # Enable modules and support for TPM auto-unlocking
           systemd.enable = true;
-
           availableKernelModules = [ "tpm_crb" ];
           kernelModules = [ "tpm_crb" ];
         };
diff --git a/modules/system/filesystem.nix b/modules/system/filesystem.nix
index 991a951..9f1260e 100644
--- a/modules/system/filesystem.nix
+++ b/modules/system/filesystem.nix
@@ -9,7 +9,7 @@ in
 {
   options = {
     aux.system.filesystem = {
-      enable = lib.mkEnableOption (lib.mdDoc "Enables standard BTRFS subvolumes and parameters.");
+      enable = lib.mkEnableOption "Enables standard BTRFS subvolumes and parameters.";
       partitions = {
         boot = lib.mkOption {
           type = lib.types.str;
@@ -28,7 +28,7 @@ in
         default = true;
       };
       swapFile = {
-        enable = lib.mkEnableOption (lib.mdDoc "Enables the creation of a swap file.");
+        enable = lib.mkEnableOption "Enables the creation of a swap file.";
         size = lib.mkOption {
           type = lib.types.int;
           description = "The size of the swap file to create in MB (defaults to 8192, or ~8 gigabytes).";
diff --git a/modules/system/gpu/amd.nix b/modules/system/gpu/amd.nix
index 5e926ed..63a2cb8 100644
--- a/modules/system/gpu/amd.nix
+++ b/modules/system/gpu/amd.nix
@@ -10,7 +10,7 @@ let
 in
 {
   options = {
-    aux.system.gpu.amd.enable = lib.mkEnableOption (lib.mdDoc "Enables AMD GPU support.");
+    aux.system.gpu.amd.enable = lib.mkEnableOption "Enables AMD GPU support.";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/system/gpu/intel.nix b/modules/system/gpu/intel.nix
index 59c7737..8499a3d 100644
--- a/modules/system/gpu/intel.nix
+++ b/modules/system/gpu/intel.nix
@@ -10,7 +10,7 @@ let
 in
 {
   options = {
-    aux.system.gpu.intel.enable = lib.mkEnableOption (lib.mdDoc "Enables Intel GPU support.");
+    aux.system.gpu.intel.enable = lib.mkEnableOption "Enables Intel GPU support.";
   };
 
   config = lib.mkIf cfg.enable {
@@ -19,26 +19,28 @@ in
 
     environment.variables.VDPAU_DRIVER = "va_gl";
 
-    hardware.opengl.extraPackages = with pkgs; [
-      (
-        if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then
-          vaapiIntel
-        else
-          intel-vaapi-driver
-      )
-      libvdpau-va-gl
-      intel-media-driver
-    ];
+    hardware.opengl = {
+      extraPackages = with pkgs; [
+        (
+          if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then
+            vaapiIntel
+          else
+            intel-vaapi-driver
+        )
+        libvdpau-va-gl
+        intel-media-driver
+      ];
 
-    hardware.opengl.extraPackages32 = with pkgs.driversi686Linux; [
-      (
-        if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then
-          vaapiIntel
-        else
-          intel-vaapi-driver
-      )
-      libvdpau-va-gl
-      intel-media-driver
-    ];
+      extraPackages32 = with pkgs.driversi686Linux; [
+        (
+          if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then
+            vaapiIntel
+          else
+            intel-vaapi-driver
+        )
+        libvdpau-va-gl
+        intel-media-driver
+      ];
+    };
   };
 }
diff --git a/modules/system/gpu/nvidia.nix b/modules/system/gpu/nvidia.nix
index 8bfb361..0113cb9 100644
--- a/modules/system/gpu/nvidia.nix
+++ b/modules/system/gpu/nvidia.nix
@@ -11,12 +11,10 @@ in
 {
   options = {
     aux.system.gpu.nvidia = {
-      enable = lib.mkEnableOption (lib.mdDoc "Enables Nvidia GPU support.");
+      enable = lib.mkEnableOption "Enables Nvidia GPU support.";
       hybrid = {
-        enable = lib.mkEnableOption (lib.mdDoc "Enables hybrid GPU support.");
-        sync = lib.mkEnableOption (
-          lib.mdDoc "Enables sync mode for faster performance at the cost of higher battery usage."
-        );
+        enable = lib.mkEnableOption "Enables hybrid GPU support.";
+        sync = lib.mkEnableOption "Enables sync mode for faster performance at the cost of higher battery usage.";
         busIDs = {
           nvidia = lib.mkOption {
             description = "The bus ID for your Nvidia GPU.";
@@ -57,24 +55,25 @@ in
     aux.system.allowUnfree = true;
 
     services.xserver.videoDrivers = lib.mkDefault [ "nvidia" ];
-    hardware.opengl.extraPackages = with pkgs; [ vaapiVdpau ];
+    hardware = {
+      opengl.extraPackages = with pkgs; [ vaapiVdpau ];
+      nvidia = {
+        modesetting.enable = true;
+        nvidiaSettings = config.aux.system.ui.desktops.enable;
+        package = config.boot.kernelPackages.nvidiaPackages.stable;
+        prime = lib.mkIf cfg.hybrid.enable {
 
-    hardware.nvidia = {
-      modesetting.enable = true;
-      nvidiaSettings = config.aux.system.ui.desktops.enable;
-      package = config.boot.kernelPackages.nvidiaPackages.stable;
-      prime = lib.mkIf cfg.hybrid.enable {
+          offload = lib.mkIf (!cfg.hybrid.sync) {
+            enable = true;
+            enableOffloadCmd = true; # Provides `nvidia-offload` command.
+          };
 
-        offload = lib.mkIf (!cfg.hybrid.sync) {
-          enable = true;
-          enableOffloadCmd = true; # Provides `nvidia-offload` command.
+          sync.enable = cfg.hybrid.sync;
+
+          nvidiaBusId = cfg.hybrid.busIDs.nvidia;
+          intelBusId = cfg.hybrid.busIDs.intel;
+          amdgpuBusId = cfg.hybrid.busIDs.amd;
         };
-
-        sync.enable = cfg.hybrid.sync;
-
-        nvidiaBusId = cfg.hybrid.busIDs.nvidia;
-        intelBusId = cfg.hybrid.busIDs.intel;
-        amdgpuBusId = cfg.hybrid.busIDs.amd;
       };
     };
   };
diff --git a/modules/system/networking.nix b/modules/system/networking.nix
index f62880c..821a62d 100644
--- a/modules/system/networking.nix
+++ b/modules/system/networking.nix
@@ -12,4 +12,8 @@
     nftables.enable = true;
     firewall.enable = true;
   };
+
+  # Enable fail2ban by default
+  # https://github.com/fail2ban/fail2ban
+  services.fail2ban.enable = true;
 }
diff --git a/modules/system/nix.nix b/modules/system/nix.nix
index d3a1522..6f3f541 100644
--- a/modules/system/nix.nix
+++ b/modules/system/nix.nix
@@ -11,11 +11,13 @@ let
 in
 {
   options = {
-    aux.system.allowUnfree = lib.mkEnableOption (lib.mdDoc "Allow unfree packages to install.");
-    aux.system.retentionPeriod = lib.mkOption {
-      description = "How long to retain NixOS generations. Defaults to one month.";
-      type = lib.types.str;
-      default = "monthly";
+    aux.system = {
+      allowUnfree = lib.mkEnableOption "Allow unfree packages to install.";
+      retentionPeriod = lib.mkOption {
+        description = "How long to retain NixOS generations. Defaults to one month.";
+        type = lib.types.str;
+        default = "monthly";
+      };
     };
   };
   config = {
@@ -33,15 +35,15 @@ in
         trusted-public-keys = [ "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" ];
 
         # Only allow these users to use Nix
-        allowed-users = [
-          "root"
-          config.users.users.aires.name
+        allowed-users = with config.users.users; [
+          root.name
+          aires.name
         ];
 
         # Avoid signature verification messages when doing remote builds
-        trusted-users = [
-          config.users.users.aires.name
-        ] ++ lib.optionals (config.aux.system.users.gremlin.enable) [ config.users.users.gremlin.name ];
+        trusted-users =
+          with config.users.users;
+          [ aires.name ] ++ lib.optionals (config.aux.system.users.gremlin.enable) [ gremlin.name ];
       };
 
       # Enable periodic nix store optimization
@@ -63,10 +65,10 @@ in
       nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
 
       # Configure remote build machines
-      # To enable remote builds for a specific host, add `nix.distributedBuilds = true;` to its config
+      # To enable a system to use remote build machines, add `nix.distributedBuilds = true;` to its config
       buildMachines = [
         {
-          hostName = "dimaga";
+          hostName = "hevana";
           systems = [
             "x86_64-linux"
             "aarch64-linux"
diff --git a/modules/system/raid.nix b/modules/system/raid.nix
index c15f460..5f58b98 100644
--- a/modules/system/raid.nix
+++ b/modules/system/raid.nix
@@ -19,6 +19,27 @@ in
         ARRAY /dev/md/Sapana metadata=1.2 UUID=51076daf:efdb34dd:bce48342:3b549fcb
         MAILADDR ${config.secrets.users.aires.email}
       '';
+
+      # Automatically scrub the array monthly
+      systemd = {
+        services."raid-scrub" = {
+          description = "Periodically scrub RAID volumes for errors.";
+          serviceConfig = {
+            Type = "oneshot";
+            User = "root";
+          };
+          script = "echo check > /sys/block/md127/md/sync_action";
+        };
+        timers."raid-scrub" = {
+          description = "Periodically scrub RAID volumes for errors.";
+          wantedBy = [ "timers.target" ];
+          timerConfig = {
+            OnCalendar = "monthly";
+            Persistent = true;
+            Unit = "raid-scrub.service";
+          };
+        };
+      };
     })
   ];
 }
diff --git a/modules/system/system.nix b/modules/system/system.nix
index de6d6b5..1e9f48d 100644
--- a/modules/system/system.nix
+++ b/modules/system/system.nix
@@ -46,7 +46,7 @@ in
     environment.systemPackages = cfg.corePackages ++ cfg.packages;
 
     services = {
-      # Automatically set the timezone
+      # Automatically set the timezone based on location
       automatic-timezoned.enable = true;
       geoclue2.enableDemoAgent = lib.mkForce true;
 
diff --git a/modules/ui/audio.nix b/modules/ui/audio.nix
index a7127ee..6479958 100644
--- a/modules/ui/audio.nix
+++ b/modules/ui/audio.nix
@@ -12,10 +12,8 @@ in
 {
   options = {
     aux.system.ui.audio = {
-      enable = lib.mkEnableOption (lib.mdDoc "Enables audio.");
-      enableLowLatency = lib.mkEnableOption (
-        lib.mdDoc "Enables low-latency audio (may cause crackling) per https://wiki.nixos.org/wiki/PipeWire#Low-latency_setup."
-      );
+      enable = lib.mkEnableOption "Enables audio.";
+      enableLowLatency = lib.mkEnableOption "Enables low-latency audio (may cause crackling) per https://wiki.nixos.org/wiki/PipeWire#Low-latency_setup.";
     };
   };
 
@@ -29,10 +27,12 @@ in
 
     services.pipewire = {
       enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
       pulse.enable = true;
       jack.enable = true;
+      alsa = {
+        enable = true;
+        support32Bit = true;
+      };
 
       # Reduce audio latency per https://wiki.nixos.org/wiki/PipeWire#Low-latency_setup
       extraConfig.pipewire = lib.mkIf cfg.enableLowLatency {
diff --git a/modules/ui/desktops/budgie.nix b/modules/ui/desktops/budgie.nix
index 9fce7f9..ce1bbb4 100644
--- a/modules/ui/desktops/budgie.nix
+++ b/modules/ui/desktops/budgie.nix
@@ -5,9 +5,7 @@ let
 in
 {
   options = {
-    aux.system.ui.desktops.budgie.enable = lib.mkEnableOption (
-      lib.mdDoc "Enables the Budgie desktop environment."
-    );
+    aux.system.ui.desktops.budgie.enable = lib.mkEnableOption "Enables the Budgie desktop environment.";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/ui/desktops/common.nix b/modules/ui/desktops/common.nix
index cfb3bcf..1cfd294 100644
--- a/modules/ui/desktops/common.nix
+++ b/modules/ui/desktops/common.nix
@@ -12,7 +12,7 @@ in
 {
   options = {
     aux.system.ui.desktops = {
-      enable = lib.mkEnableOption (lib.mdDoc "Enables base desktop environment support.");
+      enable = lib.mkEnableOption "Enables base desktop environment support.";
       xkb = lib.mkOption {
         description = "The keyboard layout to use by default. Defaults to us.";
         type = lib.types.attrs;
diff --git a/modules/ui/desktops/gnome.nix b/modules/ui/desktops/gnome.nix
index caec922..f8c91ab 100644
--- a/modules/ui/desktops/gnome.nix
+++ b/modules/ui/desktops/gnome.nix
@@ -13,10 +13,8 @@ in
 
   options = {
     aux.system.ui.desktops.gnome = {
-      enable = lib.mkEnableOption (lib.mdDoc "Enables the Gnome Desktop Environment.");
-      tripleBuffering.enable = lib.mkEnableOption (
-        lib.mdDoc "(Experimental) Enables dynamic triple buffering"
-      );
+      enable = lib.mkEnableOption "Enables the Gnome Desktop Environment.";
+      tripleBuffering.enable = lib.mkEnableOption "(Experimental) Enables dynamic triple buffering";
     };
   };
 
@@ -89,7 +87,7 @@ in
         gnomeExtensions.alphabetical-app-grid
         gnomeExtensions.appindicator
         gnomeExtensions.dash-to-panel
-        gnomeExtensions.forge
+        gnomeExtensions.random-wallpaper
         # Themeing
         gnome.gnome-themes-extra
         papirus-icon-theme
diff --git a/modules/ui/desktops/hyprland.nix b/modules/ui/desktops/hyprland.nix
index c57c400..f3f7c45 100644
--- a/modules/ui/desktops/hyprland.nix
+++ b/modules/ui/desktops/hyprland.nix
@@ -5,9 +5,7 @@ let
 in
 {
   options = {
-    aux.system.ui.desktops.hyprland.enable = lib.mkEnableOption (
-      lib.mdDoc "Enables the Hyprland desktop environment."
-    );
+    aux.system.ui.desktops.hyprland.enable = lib.mkEnableOption "Enables the Hyprland desktop environment.";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/ui/desktops/kde.nix b/modules/ui/desktops/kde.nix
index 60f2dc1..ffe46a3 100644
--- a/modules/ui/desktops/kde.nix
+++ b/modules/ui/desktops/kde.nix
@@ -12,8 +12,8 @@ in
 {
   options = {
     aux.system.ui.desktops.kde = {
-      enable = lib.mkEnableOption (lib.mdDoc "Enables the KDE Desktop Environment.");
-      useX11 = lib.mkEnableOption (lib.mdDoc "Uses X11 instead of Wayland.");
+      enable = lib.mkEnableOption "Enables the KDE Desktop Environment.";
+      useX11 = lib.mkEnableOption "Uses X11 instead of Wayland.";
     };
   };
 
diff --git a/modules/ui/desktops/xfce.nix b/modules/ui/desktops/xfce.nix
index 712ef0b..5eb3071 100644
--- a/modules/ui/desktops/xfce.nix
+++ b/modules/ui/desktops/xfce.nix
@@ -5,9 +5,7 @@ let
 in
 {
   options = {
-    aux.system.ui.desktops.xfce.enable = lib.mkEnableOption (
-      lib.mdDoc "Enables the XFCE desktop environment."
-    );
+    aux.system.ui.desktops.xfce.enable = lib.mkEnableOption "Enables the XFCE desktop environment.";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/ui/flatpak.nix b/modules/ui/flatpak.nix
index 23398f3..48c0c76 100644
--- a/modules/ui/flatpak.nix
+++ b/modules/ui/flatpak.nix
@@ -29,9 +29,7 @@ in
           }
         ];
       };
-      useBindFS = lib.mkEnableOption {
-        description = "Whether to use a BindFS mount to support custom themes and cursors. May cause performance issues.";
-      };
+      useBindFS = lib.mkEnableOption "Whether to use a BindFS mount to support custom themes and cursors. May cause performance issues.";
     };
   };
 
diff --git a/modules/users/aires/default.nix b/modules/users/aires/default.nix
index 404d533..3c8b8bb 100644
--- a/modules/users/aires/default.nix
+++ b/modules/users/aires/default.nix
@@ -62,16 +62,6 @@ in
             username = "aires";
             homeDirectory = "/home/aires";
 
-            # Install extra packages, specifically gnome extensions
-            packages = lib.mkIf config.aux.system.ui.desktops.gnome.enable [
-              pkgs.gnomeExtensions.wallpaper-slideshow
-            ];
-
-            # Set environment variables
-            sessionVariables = {
-              KUBECONFIG = "/home/aires/.kube/config";
-            };
-
             # Create .face file
             file.".face".source = ./face.png;
           };
@@ -114,19 +104,6 @@ in
               loginExtra = "fastfetch";
             };
           };
-
-          # Gnome settings specific to aires on Shura
-          /*
-            dconf.settings = lib.mkIf (config.networking.hostName == "Shura") {
-              "org/gnome/desktop/interface" = {
-                # Increase font scaling;
-                text-scaling-factor = 1.3;
-
-                # Dark mode
-                color-scheme = "prefer-dark";
-              };
-            };
-          */
         };
       }
 
diff --git a/modules/users/media/default.nix b/modules/users/media/default.nix
index 93ca682..5429e3a 100644
--- a/modules/users/media/default.nix
+++ b/modules/users/media/default.nix
@@ -13,16 +13,18 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    users.groups."media" = {
-      gid = 1001;
-    };
+    users = {
+      users.media = {
+        isNormalUser = false;
+        isSystemUser = true;
+        description = "Media manager";
+        uid = 1001;
+        group = "media";
+      };
 
-    users.users.media = {
-      isNormalUser = false;
-      isSystemUser = true;
-      description = "Media manager";
-      uid = 1001;
-      group = "media";
+      groups."media" = {
+        gid = 1001;
+      };
     };
   };
 }