diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix
index 3160a66..ae959ce 100644
--- a/home-manager/modules/ezpcusr.nix
+++ b/home-manager/modules/ezpcusr.nix
@@ -362,17 +362,6 @@ let
       Install.WantedBy = [ "default.target" ];
     };
 
-    systemd.user.services.ydotoold = {
-      Unit = {
-        Description = "Generic command-line automation tool (no X!) ";
-        PartOf = "graphical-session.target";
-      };
-
-      Service.ExecStart = "${pkgs.ydotool}/bin/ydotoold";
-
-      Install = { WantedBy = [ "graphical-session.target" ]; };
-    };
-
     home.sessionVariables = { BW_SESSION = cfg.bitwardenSession; };
 
     services.mpd = {
@@ -552,40 +541,6 @@ let
         );
     };
 
-    xdg.configFile."gebaar/gebaard.toml".text = ''
-      [commands.swipe.three]
-      left_up = ""
-      right_up = ""
-      up = ""
-      left_down = ""
-      right_down = ""
-      down = "${rofiMenu}"
-      left = "${pkgs.ydotool}/bin/ydotool key Alt+Left"
-      right = "${pkgs.ydotool}/bin/ydotool key Alt+Right"
-
-      [commands.swipe.four]
-      left_up = ""
-      right_up = ""
-      up = ""
-      left_down = ""
-      right_down = ""
-      down = ""
-      left = ""
-      right = ""
-    '';
-
-    systemd.user.services.gebaard = {
-      Unit = {
-        Description =
-          " A Super Simple WM Independent Touchpad Gesture Daemon for libinput ";
-        PartOf = "graphical-session.target";
-      };
-
-      Service.ExecStart = "${pkgs.gebaar-libinput}/bin/gebaard";
-
-      Install = { WantedBy = [ "sway-session.target" ]; };
-    };
-
     programs.mako.enable = true;
 
     systemd.user.services.swayidle = mkIf cfg.screensaver.enable {
diff --git a/modules/workstation.nix b/modules/workstation.nix
index e53d200..dcc0a9a 100644
--- a/modules/workstation.nix
+++ b/modules/workstation.nix
@@ -30,6 +30,8 @@ in
 
     services.thermald.enable = lib.mkDefault true;
 
+    boot.kernelParams = lib.optional cfg.battery "iwlwifi.power_save=Y";
+
     # Don't kill the battery
     services.upower = {
       enable = true;
@@ -44,6 +46,9 @@ in
       settings = {
         DISK_IOSCHED = "bfq bfq";
 
+        PCIE_ASPM_ON_BAT = "powersupersave";
+        PCIE_ASPM_ON_AC = "default";
+
         PLATFORM_PROFILE_ON_BAT = lib.mkDefault "low-power";
         PLATFORM_PROFILE_ON_AC = lib.mkDefault "performance";