diff options
| author | tv <tv@krebsco.de> | 2016-10-20 20:22:29 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-10-20 20:22:29 +0200 |
| commit | 9329c1e47ddda0653d7e9824a01632ce3766e8f0 (patch) | |
| tree | 2bfb70737a757d0bd61ca0aa895c77d740b21e73 /makefu/2configs/hw | |
| parent | 844d347ce7cf0b7646e9ecba3fbdc0b90e608501 (diff) | |
| parent | 0f2a9778315c3126794c0f1ad63710d38e7a67f7 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/2configs/hw')
| -rw-r--r-- | makefu/2configs/hw/tp-x220.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/hw/tp-x2x0.nix | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/makefu/2configs/hw/tp-x220.nix b/makefu/2configs/hw/tp-x220.nix index 58390e48d..2ec531e56 100644 --- a/makefu/2configs/hw/tp-x220.nix +++ b/makefu/2configs/hw/tp-x220.nix @@ -5,7 +5,7 @@ with config.krebs.lib; imports = [ ./tp-x2x0.nix ]; boot = { - kernelModules = [ "kvm-intel" "acpi_call" "tpm-rng" ]; + kernelModules = [ "kvm-intel" "acpi_call" "tpm-rng" "tp_smapi" ]; extraModulePackages = [ config.boot.kernelPackages.tp_smapi ]; }; hardware.opengl.extraPackages = [ pkgs.vaapiIntel pkgs.vaapiVdpau ]; diff --git a/makefu/2configs/hw/tp-x2x0.nix b/makefu/2configs/hw/tp-x2x0.nix index 9047cfb66..368465a8b 100644 --- a/makefu/2configs/hw/tp-x2x0.nix +++ b/makefu/2configs/hw/tp-x2x0.nix @@ -38,4 +38,8 @@ with config.krebs.lib; CPU_MIN_PERF_ON_BAT=0 CPU_MAX_PERF_ON_BAT=30 ''; + + powerManagement.resumeCommands = '' + {pkgs.rfkill}/bin/rfkill unblock all + ''; } |