diff --git a/hardware/thinkpad-p1-gen3.nix b/hardware/thinkpad-p1-gen3.nix
index e8512c7..30f919c 100644
--- a/hardware/thinkpad-p1-gen3.nix
+++ b/hardware/thinkpad-p1-gen3.nix
@@ -10,14 +10,16 @@
       availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
       luks.devices."enc".device = "/dev/disk/by-uuid/1f1e51d6-3084-4f4d-9b4b-6caa0352f542";
     };
-    kernelModules = ["kvm-intel" "acpi-call"];
+    kernelModules = ["kvm-intel" "acpi_call"];
+    extraModulePackages = with config.boot.kernelPackages; [acpi_call];
     #blacklistedKernelModules = [ "nvidia" ];
     supportedFilesystems = ["btrfs"];
+    kernelParams = ["acpi_backlight=native"];
   };
 
   powerManagement = {
     enable = true;
-    cpuFreqGovernor = "ondemand";
+    cpuFreqGovernor = "powersave";
     powertop.enable = true;
   };
 
@@ -25,7 +27,7 @@
     enable = true;
     settings = {
       START_CHARGE_THRESH_BAT0 = 75;
-      STOP_CHARGE_THRESH_BAT0 = 80;
+      STOP_CHARGE_THRESH_BAT0 = 85;
     };
   };
 
@@ -45,10 +47,10 @@
     # Enable bluetooth
     bluetooth.enable = true;
 
-    nvidia.modesetting.enable = true;
+    nvidia.modesetting.enable = false;
     nvidia.powerManagement.enable = true;
     nvidia.prime = {
-      offload.enable = true;
+      offload.enable = false;
       nvidiaBusId = "PCI:1:0:0";
       intelBusId = "PCI:0:2:0";
     };
@@ -71,7 +73,7 @@
   };
 
   services.blueman.enable = true;
-  services.xserver.videoDrivers = lib.mkForce ["nvidia"];
+  #services.xserver.videoDrivers = lib.mkForce ["nvidia"];
 
   nixpkgs.config.packageOverrides = pkgs: {
     vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};