diff --git a/modules/system/power.nix b/modules/system/power.nix
new file mode 100644
index 0000000..5d10654
--- /dev/null
+++ b/modules/system/power.nix
@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+let cfg = config.this.system.power;
+in with lib; {
+  options.this.system.power.enable = mkEnableOption "Power Management";
+
+  config = mkIf cfg.enable {
+    # fan control modules
+    boot.extraModprobeConfig = ''
+      options thinkpad_acpi fan_control=1 experimental=1
+    '';
+
+    # battery optimizations
+    powerManagement.powertop.enable = true;
+    services.upower.enable = true;
+
+    environment.systemPackages = with pkgs; [ powertop ];
+  };
+}