6 files changed, 14 insertions, 44 deletions
diff --git a/hosts/aptos/default.nix b/hosts/aptos/default.nix
index af796cf..acfc64b 100644
--- a/hosts/aptos/default.nix
+++ b/hosts/aptos/default.nix
@@ -7,6 +7,7 @@
     ./networking.nix
     ./services.nix
     "${self}/profiles/workstation.nix"
+    "${self}/profiles/laptop.nix"
   ];
 
   # Allow setting GTK configuration using home-manager
diff --git a/hosts/aptos/services.nix b/hosts/aptos/services.nix
index 3bb56b2..379ce78 100644
--- a/hosts/aptos/services.nix
+++ b/hosts/aptos/services.nix
@@ -5,12 +5,6 @@ let
 in
 {
   my.services = {
-    # monitors and controls temperature
-    thermald.enable = true;
-
-    # Enable TLP power management
-    tlp.enable = true;
-
     # enable a few services related to the gnome desktop
     gnome.enable = true;
 
diff --git a/modules/services/default.nix b/modules/services/default.nix
index 4966ed7..9c0fc3c 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -17,8 +17,6 @@
     ./ssh-server
     ./syncthing
     ./tailscale
-    ./thermald
-    ./tlp
     ./transmission
     ./unifi
   ];
diff --git a/modules/services/thermald/default.nix b/modules/services/thermald/default.nix
deleted file mode 100644
index 78a1ac4..0000000
--- a/modules/services/thermald/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-# thermal control management
-{ config, lib, ... }:
-let cfg = config.my.services.thermald;
-in
-{
-  options.my.services.thermald = {
-    enable = lib.mkEnableOption "thermald configuration";
-  };
-
-  config = lib.mkIf cfg.enable { services.thermald = { enable = true; }; };
-}
diff --git a/modules/services/tlp/default.nix b/modules/services/tlp/default.nix
deleted file mode 100644
index ac083d8..0000000
--- a/modules/services/tlp/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# TLP power management
-{ config, lib, ... }:
-let cfg = config.my.services.tlp;
-in
-{
-  options.my.services.tlp = {
-    enable = lib.mkEnableOption "TLP power management configuration";
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.tlp = {
-      enable = true;
-
-      settings = {
-        # Set CPU scaling aggressively when power is not an issue
-        CPU_SCALING_GOVERNOR_ON_AC = "schedutil";
-        CPU_SCALING_GOVERNOR_ON_BAT = "schedutil";
-
-        # Keep charge between 60% and 80% to preserve battery life
-        START_CHARGE_THRESH_BAT0 = 60;
-        STOP_CHARGE_THRESH_BAT0 = 80;
-      };
-    };
-  };
-}
diff --git a/profiles/laptop.nix b/profiles/laptop.nix
new file mode 100644
index 0000000..6b8211a
--- /dev/null
+++ b/profiles/laptop.nix
@@ -0,0 +1,13 @@
+{ pkgs, config, lib, ... }:
+{
+  services.thermald.enable = true;
+  services.tlp.enable = true;
+  services.tlp.settings = {
+    CPU_SCALING_GOVERNOR_ON_AC = "schedutil";
+    CPU_SCALING_GOVERNOR_ON_BAT = "schedutil";
+
+    # Keep charge between 60% and 80% to preserve battery life
+    START_CHARGE_THRESH_BAT0 = 60;
+    STOP_CHARGE_THRESH_BAT0 = 80;
+  };
+}