6 files changed, 14 insertions, 8 deletions
diff --git a/hardware/chromebook/default.nix b/hardware/chromebook/default.nix
index b0125ee..922f0a8 100644
--- a/hardware/chromebook/default.nix
+++ b/hardware/chromebook/default.nix
@@ -1,4 +1,9 @@
 { ... }:
 {
-  imports = [ ./hardware.nix ];
+  imports = [
+    ./hardware.nix
+
+    ../../modules/power-save
+    ../../modules/bluetooth
+  ];
 }
diff --git a/hardware/chromebook/hardware.nix b/hardware/chromebook/hardware.nix
index 5fe7a19..b0e1257 100644
--- a/hardware/chromebook/hardware.nix
+++ b/hardware/chromebook/hardware.nix
@@ -35,7 +35,6 @@ in
       };
     };
     fstrim.enable = true;
-    tlp.enable = true;
   };
 
   hardware = {
diff --git a/hardware/thinkpad/default.nix b/hardware/thinkpad/default.nix
index 226ba89..adc1519 100644
--- a/hardware/thinkpad/default.nix
+++ b/hardware/thinkpad/default.nix
@@ -1,6 +1,11 @@
 { pkgs, ... }:
 {
-  imports = [ ./hardware.nix ];
+  imports = [
+    ./hardware.nix
+
+    ../../modules/power-save
+    ../../modules/bluetooth
+  ];
 
   # nvramtool settings:
   #
diff --git a/hardware/thinkpad/hardware.nix b/hardware/thinkpad/hardware.nix
index 5fe7a19..b0e1257 100644
--- a/hardware/thinkpad/hardware.nix
+++ b/hardware/thinkpad/hardware.nix
@@ -35,7 +35,6 @@ in
       };
     };
     fstrim.enable = true;
-    tlp.enable = true;
   };
 
   hardware = {
diff --git a/hosts/luna/default.nix b/hosts/luna/default.nix
index 6135307..bee10d3 100644
--- a/hosts/luna/default.nix
+++ b/hosts/luna/default.nix
@@ -1,9 +1,6 @@
 { config, pkgs, lib, secrets, hostname, inputs, user, ... }: {
 
-  imports = [
-    ../../modules/power-save
-    ../../modules/bluetooth
-  ];
+  imports = [];
 
   services = {
     # Configure keymap in X11
diff --git a/modules/power-save/default.nix b/modules/power-save/default.nix
index 8360043..2e3f769 100644
--- a/modules/power-save/default.nix
+++ b/modules/power-save/default.nix
@@ -22,6 +22,7 @@
   };
 
   services = {
+    tlp.enable = true;
     udev.extraRules = ''
       ACTION=="add", SUBSYSTEM=="net", KERNEL=="eth*", RUN+="${pkgs.ethtool}/bin/ethtool -s %k wol d"
       ACTION=="add", SUBSYSTEM=="net", KERNEL=="wlan*", RUN+="${pkgs.iw}/bin/iw dev %k set power_save on"