Merge remote-tracking branch 'uriel/master'

1 files changed, 4 insertions, 20 deletions

diff --git a/makefu/2configs/tp-x200.nix b/makefu/2configs/tp-x200.nix
index 2bbc75c20..ed46875d8 100644
--- a/makefu/2configs/tp-x200.nix
+++ b/makefu/2configs/tp-x200.nix
@@ -2,36 +2,20 @@
 
 with lib;
 {
-  #services.xserver = {
-  #  videoDriver = "intel";
-  #};
+
+  imports = [ ./tp-x2x0.nix ];
 
   boot = {
     kernelModules = [ "tp_smapi" "msr" ];
     extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
 
   };
+  services.thinkfan.enable = true;
 
-  #networking.wireless.enable = true;
-
-  hardware.enableAllFirmware = true;
-  nixpkgs.config.allowUnfree = true;
-
-  zramSwap.enable = true;
-  zramSwap.numDevices = 2;
-
-  hardware.trackpoint.enable = true;
-  hardware.trackpoint.sensitivity = 255;
-  hardware.trackpoint.speed = 255;
+  # only works on tp-x200 , not x220
   services.xserver.displayManager.sessionCommands = ''
     xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 1
     xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 2
     xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 200
   '';
-
-  services.thinkfan.enable = true;
-  services.tlp.enable = true;
-  services.tlp.extraConfig = ''
-  START_CHARGE_THRESH_BAT0=80
-  '';
 }