diff --git a/hosts/magicman/configuration.nix b/hosts/magicman/configuration.nix
index 6f16c03..40e58ed 100644
--- a/hosts/magicman/configuration.nix
+++ b/hosts/magicman/configuration.nix
@@ -1,6 +1,4 @@
 {
-  config,
-  lib,
   pkgs,
   ...
 }:
@@ -24,6 +22,7 @@
     enable = true;
     configurationLimit = 3;
   };
+
   boot.loader.efi = {
     canTouchEfiVariables = true;
   };
@@ -91,12 +90,6 @@
   # TRIM
   services.fstrim.enable = true;
 
-  # TLP
-  services.tlp.enable = true;
-
-  # Brillo
-  hardware.brillo.enable = true;
-
   # Setup common XDG env vars
   environment.sessionVariables = rec {
     XDG_CACHE_HOME = "$HOME/.cache";
diff --git a/hosts/magicman/default.nix b/hosts/magicman/default.nix
index fbcdefc..53808e2 100644
--- a/hosts/magicman/default.nix
+++ b/hosts/magicman/default.nix
@@ -8,6 +8,7 @@
   imports = [
     ./configuration.nix
     ./hardware-configuration.nix
+    ./laptop.nix
     ../../system
     ../../home/magicman.nix
   ];
diff --git a/hosts/magicman/laptop.nix b/hosts/magicman/laptop.nix
new file mode 100644
index 0000000..105fd2f
--- /dev/null
+++ b/hosts/magicman/laptop.nix
@@ -0,0 +1,22 @@
+{ ... }:
+{
+  hardware.brillo.enable = true;
+  powerManagement.enable = true;
+
+  services.tlp.enable = true;
+  services.thermald.enable = true;
+
+  services.auto-cpufreq = {
+    enable = true;
+    settings = {
+      battery = {
+        governor = "powersave";
+        turbo = "never";
+      };
+      charger = {
+        governor = "performance";
+        turbo = "auto";
+      };
+    };
+  };
+}