diff --git a/common.nix b/common.nix
index 1ced159..c2553c1 100644
--- a/common.nix
+++ b/common.nix
@@ -17,12 +17,11 @@
 
     services.earlyoom.enable = lib.mkDefault true;
 
-    # based mosh
     programs.mosh.enable = lib.mkDefault true;
 
-    # Make Nix things not ruin my life when using a HDD
-    systemd.services.nix-daemon.serviceConfig.IOSchedulingClass = lib.mkDefault 3;
-    systemd.services.nix-gc.serviceConfig.IOSchedulingClass = lib.mkDefault 3;
+    systemd.services.nix-gc.serviceConfig.IOSchedulingPriority = lib.mkDefault 7;
+    systemd.services.nix-gc.serviceConfig.IOSchedulingClass = lib.mkDefault "idle";
+    systemd.services.nix-gc.serviceConfig.CPUSchedulingPolicy = lib.mkDefault "idle";
 
     nix = {
       package = lib.mkDefault pkgs.nixUnstable;
@@ -33,8 +32,9 @@
         options = lib.mkDefault "--delete-older-than 40d";
       };
 
-      daemonIONiceLevel = lib.mkDefault 7;
-      daemonNiceLevel = lib.mkDefault 19;
+      daemonIOSchedPriority = lib.mkDefault 7;
+      daemonIOSchedClass = lib.mkDefault "idle";
+      daemonCPUSchedPolicy = lib.mkDefault "idle";
       trustedUsers = [ "root" "builder" "@wheel" ];
 
       extraOptions = ''
diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix
index b4ab659..a66c2d5 100644
--- a/home-manager/modules/ezpcusr.nix
+++ b/home-manager/modules/ezpcusr.nix
@@ -572,10 +572,7 @@ in
 
     programs.direnv = {
       enable = lib.mkDefault true;
-      nix-direnv = {
-        enable = lib.mkDefault true;
-        enableFlakes = lib.mkDefault true;
-      };
+      nix-direnv.enable = lib.mkDefault true;
       stdlib = ''
         : ''${XDG_CACHE_HOME:=$HOME/.cache}
         declare -A direnv_layout_dirs
diff --git a/home-manager/modules/gaming.nix b/home-manager/modules/gaming.nix
index ad26c12..efb96a5 100644
--- a/home-manager/modules/gaming.nix
+++ b/home-manager/modules/gaming.nix
@@ -76,10 +76,24 @@ in
     home.packages =
       let
         newwine = (pkgs.wineFull.override { wineBuild = "wineWow"; wineRelease = "staging"; });
-        newwinetricks = pkgs.winetricks.override { wine = newwine; };
+        newwinetricks = pkgs.winetricks.overrideAttrs (old: rec {
+          pathAdd = "${newwine}/bin:" + old.pathAdd;
+          postInstall = ''
+            sed -i \
+              -e '2i PATH="${pathAdd}"' \
+              "$out/bin/winetricks"
+          '';
+        });
 
         oldwine = pkgs.wineWowPackages.full;
-        oldwinetricks = pkgs.winetricks.override { wine = oldwine; };
+        oldwinetricks = pkgs.winetricks.overrideAttrs (old: rec {
+          pathAdd = "${oldwine}/bin:" + old.pathAdd;
+          postInstall = ''
+            sed -i \
+              -e '2i PATH="${pathAdd}"' \
+              "$out/bin/winetricks"
+          '';
+        });
       in
       with pkgs; [
         oldwine