diff --git a/hm/modules/linux/platform-tweaks/default.nix b/hm/modules/linux/platform-tweaks/default.nix
index 4a389e4..f3ab7e4 100644
--- a/hm/modules/linux/platform-tweaks/default.nix
+++ b/hm/modules/linux/platform-tweaks/default.nix
@@ -25,8 +25,6 @@ in
   };
 
   config = {
-    services.tlp.enable = lib.mkIf (cfg.formFactor == "laptop") true;
-    programs.light.enable = lib.mkIf (cfg.formFactor == "laptop") true;
     assertions = [
       {
         assertion = cfg.formFactor != null;
diff --git a/modules/linux/core/default.nix b/modules/linux/core/default.nix
index cc88d2a..ed06c1b 100644
--- a/modules/linux/core/default.nix
+++ b/modules/linux/core/default.nix
@@ -183,6 +183,9 @@ in
 
     programs.fish.enable = true;
 
+    services.tlp.enable = lib.mkIf (cfg.formFactor == "laptop") true;
+    programs.light.enable = lib.mkIf (cfg.formFactor == "laptop") true;
+
     hardware.bluetooth = lib.mkIf cfg.bluetooth.enable {
       enable = true;
       powerOnBoot = true;