diff --git a/modules/system/base.nix b/modules/system/base.nix
index 3a20057..d62b589 100644
--- a/modules/system/base.nix
+++ b/modules/system/base.nix
@@ -16,6 +16,9 @@
   i18n.defaultLocale = locale;
   environment.localBinInPath = true;
 
+  powerManagement.cpuFreqGovernor = "powersave";
+  boot.kernel.sysctl."vm.swappiness" = 10; # only swap when necessary
+  
   security = {
     polkit = {
       enable = true;
diff --git a/modules/system/homelab/mc/default.nix b/modules/system/homelab/mc/default.nix
index 2217a08..a452cfd 100644
--- a/modules/system/homelab/mc/default.nix
+++ b/modules/system/homelab/mc/default.nix
@@ -5,9 +5,6 @@
     inputs.mc.nixosModules.minecraft-servers
   ];
   nixpkgs.overlays = [ inputs.mc.overlay ];
-  
-  powerManagement.cpuFreqGovernor = "powersave"; # performance governor causes overheating and thermal throttling, works fine with powesave
-  boot.kernel.sysctl."vm.swappiness" = 10; # reduce swap usage and keep memory performance smooth
 
   services.minecraft-servers = {
     # LOCK IN