From 924ac9dad3a17b51dfd62391024801a98691cea8 Mon Sep 17 00:00:00 2001
From: "Alexander \"PapaTutuWawa" <papatutuwawa@polynom.me>
Date: Mon, 30 Aug 2021 11:46:39 +0200
Subject: [PATCH] overlays: Cleanly comment out the optimal overlay

---
 overlays/steam.nix | 57 +++++++++++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 23 deletions(-)

diff --git a/overlays/steam.nix b/overlays/steam.nix
index a11f4b5..bc91528 100644
--- a/overlays/steam.nix
+++ b/overlays/steam.nix
@@ -15,26 +15,37 @@ in {
   };
 }
 
-#let
-#  # NOTE: This is a really messy solution
-#  buildFHSUserEnvBubblewrap = prev.callPackage ../packages/build-support/build-fhs-userenv-bubblewrap {};
-#in {
-#  steamPackages = prev.steamPackages.override {
-#    buildFHSUserEnv = buildFHSUserEnvBubblewrap;
-#    # Include gamemode in the FHS
-#    #extraPkgs = (pkgs: with pkgs; [ gamemode ]);
-#  };
-#
-#  steam = prev.steamPackages.steam-fhsenv.overrideAttrs (old: {
-#    specifyHomeDirs = true;
-#    chdirTo = "/home/$USER";
-#  });
-# #steam = final.steamPackages.steam-fhsenv.override {
-# #  extraPkgs = pkgs: with pkgs; [ gamemode ];
-# #};
-#  steam-run = final.steam.run;
-#  steam-run-native = (final.steam.override {
-#    nativeOnly = true;
-#  });
-#  steamcmd = final.steamPackages.steamcmd;
-#}
+/*
+let
+  # NOTE: This is a really messy solution
+  buildFHSUserEnvBubblewrap = prev.callPackage ../packages/build-support/build-fhs-userenv-bubblewrap {};
+in {
+  steamPackages = prev.steamPackages.override {
+    buildFHSUserEnv = buildFHSUserEnvBubblewrap;
+    # Include gamemode in the FHS
+    #extraPkgs = (pkgs: with pkgs; [ gamemode ]);
+  };
+
+  steam = lib.overrideDerivation prev.steamPackages.steam-fhsenv (old: {
+   specifyHomeDirs = true;
+   mountInHome = [
+     ".steam"
+     ".local/share/Steam"
+   ];
+   chdirTo = "/home/$USER";
+   additionalBlacklist = [ "/mnt" ];
+   additionalMounts = [ "/mnt/Storage/Games/SteamLibrary" ];
+   #extraEnv = {
+   #  DRI_PRIME = "1";
+   #};
+  });
+ #steam = final.steamPackages.steam-fhsenv.override {
+ #  extraPkgs = pkgs: with pkgs; [ gamemode ];
+ #};
+  steam-run = final.steam.run;
+  steam-run-native = (final.steam.override {
+    nativeOnly = true;
+  });
+  steamcmd = final.steamPackages.steamcmd;
+}
+*/