diff --git a/devices/surface/default.nix b/devices/surface/default.nix
index b49a868..ce1e96d 100644
--- a/devices/surface/default.nix
+++ b/devices/surface/default.nix
@@ -5,6 +5,20 @@
 
   networking.hostName = "surface";
 
+  services.auto-cpufreq = {
+    enable = true;
+    settings = {
+      battery = {
+        governor = "powersaver";
+        turbo = "never";
+      };
+      charger = {
+        governor = "performance";
+        turbo = "auto";
+      };
+    };
+  };
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 7559842..17d3f13 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -69,7 +69,7 @@
   users.users.twoneis = {
     isNormalUser = true;
     description = "twoneis";
-    extraGroups = [ "networkmanager" "wheel" ];
+    extraGroups = [ "networkmanager" "wheel" "surface-control" ];
   };
 
   # Allow unfree packages