summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/hw
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-10-19 12:37:05 +0200
committerlassulus <lass@aidsballs.de>2016-10-19 12:37:05 +0200
commit7aa9fb7eff3a4356097b46bf531969027a0935a0 (patch)
treefaa02f6d1f5cefc5fdf55cdffe5c4bddea4be616 /makefu/2configs/hw
parentcbd83bb95fb3b4443523cc277b662ce4dd9d5925 (diff)
parent7ebecdc99cd9a1ad9ec7c047348e6ea6faf566c5 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/hw')
-rw-r--r--makefu/2configs/hw/tp-x220.nix2
-rw-r--r--makefu/2configs/hw/tp-x2x0.nix4
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
+ '';
}