3 files changed, 19 insertions, 7 deletions
diff --git a/makefu/2configs/hw/bcm4352.nix b/makefu/2configs/hw/bcm4352.nix
index 516637eb8..5dc8a1449 100644
--- a/makefu/2configs/hw/bcm4352.nix
+++ b/makefu/2configs/hw/bcm4352.nix
@@ -1,6 +1,7 @@
 {config, ...}:
 {
   networking.enableB43Firmware = true;
+  boot.kernelModules = [ "wl" ];
   boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
 }
 
diff --git a/makefu/2configs/hw/tp-x220.nix b/makefu/2configs/hw/tp-x230.nix
index ce3e34ad3..99563a771 100644
--- a/makefu/2configs/hw/tp-x220.nix
+++ b/makefu/2configs/hw/tp-x230.nix
@@ -5,9 +5,19 @@ with import <stockholm/lib>;
 
   imports = [ ./tp-x2x0.nix ];
   boot = {
-    kernelModules = [ "kvm-intel" "acpi_call" "tpm-rng" "tp_smapi" ];
-    extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
+    # tp-smapi is not supported bt x230 anymore
+    kernelModules = [
+      "kvm-intel"
+      "thinkpad_ec"
+   #   "acpi_call"
+   #   "thinkpad_acpi"
+   #   "tpm-rng"
+    ];
+    extraModulePackages = [
+    #  config.boot.kernelPackages.acpi_call
+    ];
   };
+  services.acpid.enable = true;
   hardware.opengl.extraPackages =  [ pkgs.vaapiIntel pkgs.vaapiVdpau ];
   services.xserver = {
     videoDriver = "intel";
@@ -15,8 +25,8 @@ with import <stockholm/lib>;
       Option "AccelMethod" "sna"
     '';
   };
-
-  security.rngd.enable = true;
+  # no entropy source working
+  # security.rngd.enable = true;
 
   services.xserver.displayManager.sessionCommands =''
     xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 8 1
diff --git a/makefu/2configs/hw/tp-x2x0.nix b/makefu/2configs/hw/tp-x2x0.nix
index 2b615ecfa..02bd8bb01 100644
--- a/makefu/2configs/hw/tp-x2x0.nix
+++ b/makefu/2configs/hw/tp-x2x0.nix
@@ -28,8 +28,9 @@ with import <stockholm/lib>;
   services.tlp.enable = true;
   services.tlp.extraConfig = ''
     # BUG: http://linrunner.de/en/tlp/docs/tlp-faq.html#erratic-battery
-    #START_CHARGE_THRESH_BAT0=80
-    STOP_CHARGE_THRESH_BAT0=95
+    START_CHARGE_THRESH_BAT0=67
+    STOP_CHARGE_THRESH_BAT0=100
+
 
     CPU_SCALING_GOVERNOR_ON_AC=performance
     CPU_SCALING_GOVERNOR_ON_BAT=ondemand
@@ -40,6 +41,6 @@ with import <stockholm/lib>;
   '';
 
   powerManagement.resumeCommands = ''
-    {pkgs.rfkill}/bin/rfkill unblock all
+    ${pkgs.rfkill}/bin/rfkill unblock all
   '';
 }