about summary refs log tree commit diff
path: root/nixos/modules/services/hardware
diff options
context:
space:
mode:
authorLuca Bruno <lethalman88@gmail.com>2015-12-11 18:31:00 +0100
committerLuca Bruno <lethalman88@gmail.com>2015-12-11 18:31:00 +0100
commit5b0352a6a43fdd924a53cde4b81c15b755fa0a27 (patch)
treecf0fcc2be2f6d08c970f0322a63ff0a31d5d5dee /nixos/modules/services/hardware
parent2f0fe05543ce594eacf0310966914d6e19a42f88 (diff)
parent146784f835a6cadc65812c5adf76533c18e5be61 (diff)
downloadnixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar
nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.gz
nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.bz2
nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.lz
nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.xz
nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.zst
nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.zip
Merge branch 'master' into closure-size
Diffstat (limited to 'nixos/modules/services/hardware')
-rw-r--r--nixos/modules/services/hardware/tlp.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index 23b6edcefd1a..6427c5be6818 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -10,7 +10,6 @@ enableRDW = config.networking.networkmanager.enable;
 
 tlp = pkgs.tlp.override {
   inherit enableRDW;
-  kmod = config.system.sbin.modprobe;
 };
 
 # XXX: We can't use writeTextFile + readFile here because it triggers
@@ -69,6 +68,8 @@ in
           ExecStart = "${tlp}/bin/tlp init start";
           ExecStop = "${tlp}/bin/tlp init stop";
         };
+
+        environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/";
       };
 
       tlp-sleep = {
@@ -87,6 +88,8 @@ in
           ExecStart = "${tlp}/bin/tlp suspend";
           ExecStop = "${tlp}/bin/tlp resume";
         };
+
+        environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/";
       };
     };