diff --git a/modules/workstation.nix b/modules/workstation.nix
index c08cf3c..b17b9d2 100644
--- a/modules/workstation.nix
+++ b/modules/workstation.nix
@@ -35,17 +35,9 @@ in {
 
     services.thermald.enable = lib.mkDefault true;
 
-    boot.kernelParams = lib.optionals cfg.battery [
-      "iwlwifi.uapsd_disable=0"
-      "iwlmvm.power_scheme=3"
-      "iwldvm.force_cam=0"
-      "snd_hda_intel.power_save=1"
-      "snd_ac97_codec.power_save=1"
-    ];
-
     # Don't kill the battery
     services.upower = {
-      enable = lib.mkDefault true;
+      enable = lib.mkDefault cfg.battery;
       percentageLow = lib.mkDefault 15;
       percentageCritical = lib.mkDefault 10;
       percentageAction = lib.mkDefault 5;