diff options
author | jeschli <jeschli@gmail.com> | 2018-01-05 21:14:15 +0100 |
---|---|---|
committer | jeschli <jeschli@gmail.com> | 2018-01-05 21:14:15 +0100 |
commit | 183b001e1aca601e420ef07ec4944a15c13a8d2c (patch) | |
tree | 9d34f79c2ee7cb073a39ab44ef2795055a42d067 /makefu/2configs/hw/tp-x230.nix | |
parent | ea85e788ae2a6ca24ccb997372542f7f2a104080 (diff) | |
parent | e083b18e34519f30bba79dfd894c3b828fd13da7 (diff) |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'makefu/2configs/hw/tp-x230.nix')
-rw-r--r-- | makefu/2configs/hw/tp-x230.nix | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/makefu/2configs/hw/tp-x230.nix b/makefu/2configs/hw/tp-x230.nix index 14572b35..ec4e05d1 100644 --- a/makefu/2configs/hw/tp-x230.nix +++ b/makefu/2configs/hw/tp-x230.nix @@ -3,38 +3,14 @@ with import <stockholm/lib>; { - imports = [ ./tp-x2x0.nix ]; - boot = { - # 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 - ]; - # support backlight adjustment - kernelParams = [ "acpi_osi=Linux" "acpi_backlight=vendor" ]; - }; + imports = [ ./tp-x2x0.nix <nixos-hardware/lenovo/thinkpad/x230> ]; # configured media keys inside awesomerc # sound.mediaKeys.enable = true; hardware.bluetooth.enable = true; - services.acpid.enable = true; - hardware.opengl.extraPackages = [ pkgs.vaapiIntel pkgs.vaapiVdpau ]; - services.xserver = { - videoDriver = "intel"; - deviceSection = '' - Option "AccelMethod" "sna" - Option "Backlight" "intel_backlight" - ''; - }; - - security.rngd.enable = true; + # possible i915 powersave options: + # options i915 enable_rc6=1 enable_fbc=1 semaphores=1 services.xserver.displayManager.sessionCommands ='' xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 8 1 |