diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix
index bf10303..7d51480 100644
--- a/hosts/nixos/configuration.nix
+++ b/hosts/nixos/configuration.nix
@@ -73,20 +73,9 @@
   # Enable fstrim
   services.fstrim.enable = true;
 
-  # Enable upower
-  services.upower.enable = true;
-
-  # Setup udev for android rules
-  services.udev.packages = [
-    pkgs.android-udev-rules
-  ];
-
   # Enable ratbagd to customize mouse options
   services.ratbagd.enable = true;
 
-  # Enable firmware updater
-  services.fwupd.enable = true;
-
   # Enable sound with pipewire.
   services.pulseaudio.enable = false;
   security.rtkit.enable = true;
@@ -123,9 +112,6 @@
   # Enable nixd to see nixpkgs path
   nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
 
-  # Enable zram swap device
-  zramSwap.enable = true;
-
   # DO NOT CHANGE
   system.stateVersion = "24.11";
 }
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index b56a8f5..024aee7 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -17,6 +17,7 @@
     ./hyprland.nix
     ./sddm.nix
     ./watchdog.nix
+    ./general-services.nix
     ./additional-hardware
   ];
 
@@ -37,5 +38,6 @@
   crony.hyprland-nixos.enable = lib.mkDefault true;
   crony.sddm.enable = lib.mkDefault true;
   crony.watchdog.disable = lib.mkDefault true;
+  crony.general-services.enable = lib.mkDefault true;
   crony.additional-hardware.enable = lib.mkDefault true;
 }
diff --git a/modules/nixos/general-services.nix b/modules/nixos/general-services.nix
new file mode 100644
index 0000000..22ebd86
--- /dev/null
+++ b/modules/nixos/general-services.nix
@@ -0,0 +1,25 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  options = {
+    crony.general-services.enable = lib.mkEnableOption "Enable general services that just should be enabled by default.";
+  };
+
+  config = lib.mkIf config.crony.general-services.enable {
+    # Enable upower
+    services.upower.enable = true;
+
+    # Setup udev for android rules
+    services.udev.packages = [
+      pkgs.android-udev-rules
+    ];
+    # Enable firmware updater
+    services.fwupd.enable = true;
+
+    # Enable zram swap device
+    zramSwap.enable = true;
+  };
+}