diff --git a/modules/hardware/battery.nix b/modules/hardware/battery.nix
index 13e27b2..224aa32 100644
--- a/modules/hardware/battery.nix
+++ b/modules/hardware/battery.nix
@@ -22,7 +22,7 @@ _: {
     #  };
 
     #  config = lib.mkIf cfg.battery.enable {
-    powerManagement.powertop.enable = true; # enable powertop auto tuning on startup.
+    /*powerManagement.powertop.enable = true; # enable powertop auto tuning on startup.
     # Acording to https://community.frame.work/t/solved-keys-stick-and-repeat-after-being-released/51153/12
     # Some powertop bug is responsable for the problem of the random keypress being stuck
     # fix: from https://git.gabbie.blue/blue/nixconf/src/commit/2d1bc6dad4684c019b6b3e894408e76e2734806c/hosts/gabbielaptop/configuration.nix#L68
@@ -30,9 +30,9 @@ _: {
       ${lib.getExe' config.systemd.package "udevadm"} trigger -c bind -s usb -a idVendor=32ac -a idProduct=0018
       # Retrigger macropad udev rules
       ${lib.getExe' config.systemd.package "udevadm"} trigger -c bind -s usb -a idVendor=32ac -a idProduct=0013
-    '';
+    '';*/
     services.system76-scheduler.settings.cfsProfiles.enable = true; # Better scheduling for CPU cycles - thanks System76!!!
-    services.thermald.enable = true; # Enable thermald, the temperature management daemon. (only necessary if on Intel CPUs)
+    services.thermald.enable = false; # Enable thermald, the temperature management daemon. (only necessary if on Intel CPUs)
     services.power-profiles-daemon.enable = false; # Disable GNOMEs power management
     services.tlp = {
       enable = true; # Enable TLP (better than gnomes internal power manager)
@@ -47,7 +47,6 @@ _: {
         CPU_ENERGY_PERF_POLICY_ON_BAT = "powersave";
         PLATFORM_PROFILE_ON_AC = "balanced";
         PLATFORM_PROFILE_ON_BAT = "powersave";
-        START_CHARGE_THRESH_BAT1 = 40;
         STOP_CHARGE_THRESH_BAT1 = 80;
       };
     };
diff --git a/modules/hosts/laptop.nix b/modules/hosts/laptop.nix
index 13553ba..8c5132f 100644
--- a/modules/hosts/laptop.nix
+++ b/modules/hosts/laptop.nix
@@ -18,7 +18,7 @@
       audioAndMedia
       autoCleanup-laptop
       autoUpdate-laptop
-      #battery-laptop
+      battery-laptop
       bluetooth
       bootloader
       browsers