diff --git a/system/_sigmachine.nix b/system/_sigmachine.nix
index 6514e15..c611d5b 100644
--- a/system/_sigmachine.nix
+++ b/system/_sigmachine.nix
@@ -1,8 +1,6 @@
 { config, pkgs, ... }: {
   boot.initrd.kernelModules = [ "amdgpu" ];
 
-  services.xserver.videoDrivers = [ "nvidia" ];
-
   hardware = {
     nvidia = {
       modesetting.enable = true;
@@ -38,6 +36,26 @@
     };
   };
 
+  services = {
+    auto-cpufreq = {
+      enable = true;
+      settings = {
+        battery = {
+          governor = "powersave";
+          turbo = "never";
+        };
+
+        charger = {
+          governor = "performance";
+          turbo = "auto";
+        };
+      };
+    };
+
+    xserver.videoDrivers = [ "nvidia" ];
+    upower.enable = true;
+  };
+
   system = {
     copySystemConfiguration = false;
     stateVersion = "22.11";
diff --git a/system/default.nix b/system/default.nix
index 397215e..e5aa229 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -103,21 +103,6 @@
 
   security.rtkit.enable = true;
   services = {
-    auto-cpufreq = {
-      enable = true;
-      settings = {
-        battery = {
-          governor = "powersave";
-          turbo = "never";
-        };
-
-        charger = {
-          governor = "performance";
-          turbo = "auto";
-        };
-      };
-    };
-
     libinput = {
       enable = true;
       mouse.accelProfile = "flat";
@@ -157,8 +142,6 @@
       };
       windowManager.qtile.enable = true;
     };
-
-    upower.enable = true;
   };
 
   users.users.${username} = {