wine: switch to nix-gaming's wine-tkg

flake.lock

@@ -158,6 +158,21 @@
         "type": "github"
       }
     },
+    "flake-utils_3": {
+      "locked": {
+        "lastModified": 1623875721,
+        "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -223,7 +238,43 @@
         "type": "github"
       }
     },
+    "nix-gaming": {
+      "inputs": {
+        "nixpkgs": "nixpkgs",
+        "oglfPatches": "oglfPatches",
+        "tkgPatches": "tkgPatches",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1630423490,
+        "narHash": "sha256-6jnCWm+AHb3+eyxk8mjEy6IvlFuKVIYuAAB/O0u4Mrc=",
+        "owner": "fufexan",
+        "repo": "nix-gaming",
+        "rev": "dd0cf9f77869f48086e0801d2ca00195a78b060b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "fufexan",
+        "repo": "nix-gaming",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1628417749,
+        "narHash": "sha256-LI00lL97qfnVPYLM50nh9BhHY9viHziuLjkMzBrIuTE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3a8b5de9f0db6be3eccf4987b09af26499ceff6f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1630050004,
         "narHash": "sha256-ayQ3UjWR+qY3cApkYKE4BgPiFjcoRGXUcU2t/0gijQU=",
@@ -254,6 +305,23 @@
         "type": "github"
       }
     },
+    "oglfPatches": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1629854275,
+        "narHash": "sha256-hnj86MirD0jU4NzkdRoaODuryGRPUavA9qhGWlixk2Y=",
+        "owner": "openglfreak",
+        "repo": "wine-tkg-userpatches",
+        "rev": "c5d849279c8a90123162d92413aa249c2f044dc0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "openglfreak",
+        "repo": "wine-tkg-userpatches",
+        "rev": "c5d849279c8a90123162d92413aa249c2f044dc0",
+        "type": "github"
+      }
+    },
     "powercord": {
       "flake": false,
       "locked": {
@@ -276,7 +344,7 @@
           "nixpkgs"
         ],
         "powercord": "powercord",
-        "utils": "utils"
+        "utils": "utils_2"
       },
       "locked": {
         "lastModified": 1629990696,
@@ -367,7 +435,8 @@
         "fix-user-popouts": "fix-user-popouts",
         "home-manager": "home-manager",
         "neovim-nightly": "neovim-nightly",
-        "nixpkgs": "nixpkgs",
+        "nix-gaming": "nix-gaming",
+        "nixpkgs": "nixpkgs_2",
         "no-double-back-pc": "no-double-back-pc",
         "powercord-overlay": "powercord-overlay",
         "powercord-popout-fix": "powercord-popout-fix",
@@ -416,6 +485,23 @@
         "type": "github"
       }
     },
+    "tkgPatches": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1628767531,
+        "narHash": "sha256-tcprbnfojbCQLiebOaiOp0Occ/6f0m38N56bzgGKuJc=",
+        "owner": "Frogging-Family",
+        "repo": "wine-tkg-git",
+        "rev": "de6cd55961861c254bb4d96481a75bfb78553e5d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Frogging-Family",
+        "ref": "6.14.r6.g1bc4da9d",
+        "repo": "wine-tkg-git",
+        "type": "github"
+      }
+    },
     "tokyonight": {
       "flake": false,
       "locked": {
@@ -452,6 +538,25 @@
       "inputs": {
         "flake-utils": "flake-utils_2"
       },
+      "locked": {
+        "lastModified": 1626816926,
+        "narHash": "sha256-mJKFdfc4UWL49ar2Tc4krKMnDUa0Dkhj8QmbR3SThHo=",
+        "owner": "gytis-ivaskevicius",
+        "repo": "flake-utils-plus",
+        "rev": "5dba7556e1c7f36152c9f65c16bc813ec73ee6a5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gytis-ivaskevicius",
+        "ref": "staging",
+        "repo": "flake-utils-plus",
+        "type": "github"
+      }
+    },
+    "utils_2": {
+      "inputs": {
+        "flake-utils": "flake-utils_3"
+      },
       "locked": {
         "lastModified": 1628855985,
         "narHash": "sha256-OqhVFoCCA6GfGuMhZXQ5CrmZUYsumCJTwI72FOMf82I=",

flake.nix

@@ -8,6 +8,7 @@
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     neovim-nightly.inputs.nixpkgs.follows = "nixpkgs";
 
+    nix-gaming.url = "github:fufexan/nix-gaming";
     powercord-overlay.url = "github:LavaDesu/powercord-overlay";
     powercord-overlay.inputs.nixpkgs.follows = "nixpkgs";
 

modules/system/nix.nix

@@ -4,10 +4,12 @@
     binaryCaches = [
       "https://cache.nixos.org?priority=10"
       "https://lava.cachix.org"
+      "https://nix-gaming.cachix.org"
     ];
     binaryCachePublicKeys = [
       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
       "lava.cachix.org-1:8lTWI/3IKWHByzzYHZySunMPYs2eAJw2duL+uLZkSy0="
+      "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
     ];
     trustedBinaryCaches = binaryCaches;
 

modules/user/packages-rin.nix

@@ -10,7 +10,7 @@
     transcrypt
     unrar
     weechat
-    wine-osu
+    inputs.nix-gaming.packages.x86_64-linux.wine-tkg
     (winetricks.override { wine = wine-osu; })
     youtube-dl