diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix
index 6cf244e..3160a66 100644
--- a/home-manager/modules/ezpcusr.nix
+++ b/home-manager/modules/ezpcusr.nix
@@ -184,8 +184,6 @@ let
               line=$(${pkgs.coreutils}/bin/cat ${emojiTxt} | ${rofiBin} -dmenu -i)
 
               ${pkgs.coreutils}/bin/echo ''${line::1} | ${copyBin}
-              ${pkgs.coreutils}/bin/sleep 0.3
-              ${pkgs.xdotool}/bin/xdotool type "''${line::1}"
             '';
 
           configPlace =
diff --git a/modules/workstation.nix b/modules/workstation.nix
index 46f3a6c..61a71a2 100644
--- a/modules/workstation.nix
+++ b/modules/workstation.nix
@@ -32,7 +32,7 @@ in
 
     # Don't kill the battery
     services.upower = {
-      enable = lib.mkDefault cfg.battery;
+      enable = true;
       percentageLow = 15;
       percentageCritical = 10;
       percentageAction = 5;
@@ -42,19 +42,32 @@ in
     # Make battery usage sane
     services.tlp = {
       enable = lib.mkDefault cfg.battery;
-      extraConfig = ''
-        TLP_ENABLE=1
-        CPU_SCALING_GOVERNOR_ON_BAT=powersave
-        CPU_SCALING_GOVERNOR_ON_AC=ondemand
-        CPU_BOOST_ON_BAT=0
-        CPU_BOOST_ON_AC=1
-        CPU_MIN_PERF_ON_BAT=0
-        CPU_MAX_PERF_ON_BAT=30
-        CPU_MIN_PERF_ON_AC=0
-        CPU_MAX_PERF_ON_AC=100
-        CPU_ENERGY_PERF_POLICY_ON_BAT=power
-        CPU_ENERGY_PERF_POLICY_ON_AC=ondemand
-      '';
+      settings = {
+        DISK_IOSCHED = "bfq bfq";
+
+        PLATFORM_PROFILE_ON_BAT = lib.mkDefault "low-power";
+        PLATFORM_PROFILE_ON_AC = lib.mkDefault "performance";
+
+        CPU_SCALING_GOVERNOR_ON_BAT = lib.mkOverride 900 "powersave";
+        CPU_SCALING_GOVERNOR_ON_AC = lib.mkOverride 900 "performance";
+
+        CPU_ENERGY_PERF_POLICY_ON_BAT = lib.mkDefault "power";
+        CPU_ENERGY_PERF_POLICY_ON_AC = lib.mkDefault "performance";
+
+        CPU_BOOST_ON_BAT = lib.mkDefault 0;
+        CPU_BOOST_ON_AC = lib.mkDefault 1;
+
+        CPU_HWP_DYN_BOOST_ON_BAT = lib.mkDefault 0;
+        CPU_HWP_DYN_BOOST_ON_AC = lib.mkDefault 1;
+
+        SCHED_POWERSAVE_ON_BAT = lib.mkDefault 0;
+        SCHED_POWERSAVE_ON_AC = lib.mkDefault 1;
+
+        CPU_MIN_PERF_ON_BAT = lib.mkDefault 0;
+        CPU_MAX_PERF_ON_BAT = lib.mkDefault 30;
+        CPU_MIN_PERF_ON_AC = lib.mkDefault 0;
+        CPU_MAX_PERF_ON_AC = lib.mkDefault 100;
+      };
     };
 
     # Video support