From 322ae93e3533340787a710f764f3d70664eacef1 Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Wed, 4 Aug 2021 22:15:17 +0200
Subject: [PATCH] feat(gaming): update gaming configuration

---
 home-pc.nix             |  1 +
 home/felschr.nix        |  5 +----
 home/gaming/default.nix |  2 --
 home/gaming/lutris.nix  | 42 ++++++++++++++++++++---------------------
 home/gaming/steam.nix   | 18 +++++++++++++++++-
 home/steam.nix          | 12 ------------
 6 files changed, 40 insertions(+), 40 deletions(-)
 delete mode 100644 home/steam.nix

diff --git a/home-pc.nix b/home-pc.nix
index 7aa311f..c12bad3 100644
--- a/home-pc.nix
+++ b/home-pc.nix
@@ -7,6 +7,7 @@
     ./hardware/steam.nix
     ./hardware/ledger.nix
     ./system
+    ./system/gaming.nix
     ./desktop
     ./virtualisation/docker.nix
     ./services/syncthing/felix-nixos.nix
diff --git a/home/felschr.nix b/home/felschr.nix
index dd7523c..42bcdc2 100644
--- a/home/felschr.nix
+++ b/home/felschr.nix
@@ -14,7 +14,7 @@
     ./browsers
     ./planck.nix
     ./ausweisapp.nix
-    ./steam.nix
+    ./gaming
   ];
 
   services.gammastep = {
@@ -73,9 +73,6 @@
     # learning
     anki
 
-    # gaming
-    lutris
-
     # privacy
     onionshare-gui
     transmission-gtk
diff --git a/home/gaming/default.nix b/home/gaming/default.nix
index fa1818c..56f93fc 100644
--- a/home/gaming/default.nix
+++ b/home/gaming/default.nix
@@ -2,6 +2,4 @@
 
 {
   imports = [ ./steam.nix ./lutris.nix ];
-
-  programs.gamemode.enable = true;
 }
diff --git a/home/gaming/lutris.nix b/home/gaming/lutris.nix
index bcab676..d083024 100644
--- a/home/gaming/lutris.nix
+++ b/home/gaming/lutris.nix
@@ -1,31 +1,31 @@
-{ config, pkgs, nixosConfig, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   home.packages = with pkgs; [ lutris ];
 
   xdg.dataFile = {
-    wine-runner-sc.source = let version = "6.10";
-    in {
-      executable = true;
-      recursive = true;
-      source = builtins.fetchTarball {
-        src =
-          "https://github.com/snatella/wine-runner-sc/releases/download/wine-v${version}/wine-runner-${version}-gold-fsync.tgz";
-        sha256 = "";
-      };
-      target = "lutris/wine/wine-runner-sc";
-    };
+    wine-runner-sc = let
+      package = { }:
+        pkgs.stdenv.mkDerivation rec {
+          name = "wine-runner-sc";
+          version = "6.10";
 
-    proton-ge = let version = "6.12-GE-1";
+          src = pkgs.fetchurl {
+            url =
+              "https://github.com/snatella/wine-runner-sc/releases/download/wine-v${version}/wine-runner-${version}-gold-fsync.tgz";
+            sha256 = "03v0qrhjc0qv3rmx3zb82d3pwqp3ys0r3dhqdplls2nv69ik5b9l";
+          };
+
+          phases = [ "unpackPhase" "installPhase" ];
+          unpackCmd = "tar -xzf $src";
+          sourceRoot = ".";
+          installPhase = "cp -r . $out";
+        };
+      source = pkgs.callPackage package { };
     in {
-      executable = true;
-      recursive = true;
-      source = builtins.fetchTarball {
-        url =
-          "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${version}/Proton-${version}.tar.gz";
-        sha256 = "12pk1bvjrziszglbrc6f0i555b19ycmf3cc70k63d53lyz3ra9vp";
-      };
-      target = "Steam/compatibilitytools.d/proton-ge";
+      recursive = false;
+      inherit source;
+      target = "lutris/runners/wine/wine-runner-sc";
     };
   };
 }
diff --git a/home/gaming/steam.nix b/home/gaming/steam.nix
index 4a9b099..e30be23 100644
--- a/home/gaming/steam.nix
+++ b/home/gaming/steam.nix
@@ -9,4 +9,20 @@ let
       else
         [ package32 ] ++ extraPackages32;
   };
-in { home.packages = [ steam steam.run ]; }
+in {
+  home.packages = [ steam steam.run ];
+
+  xdg.dataFile = {
+    # TODO doesn't show up in steam
+    proton-ge = let version = "6.12-GE-1";
+    in {
+      recursive = false;
+      source = builtins.fetchTarball {
+        url =
+          "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${version}/Proton-${version}.tar.gz";
+        sha256 = "0j3ca5qqvj294ax9xpxcm9s70vdkhk1sskn53hq3pcn3p9yr6phq";
+      };
+      target = "Steam/compatibilitytools.d/proton-ge-${version}";
+    };
+  };
+}
diff --git a/home/steam.nix b/home/steam.nix
deleted file mode 100644
index 4a9b099..0000000
--- a/home/steam.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, pkgs, nixosConfig, ... }:
-
-let
-  steam = pkgs.steam.override {
-    extraLibraries = pkgs:
-      with nixosConfig.hardware.opengl;
-      if pkgs.hostPlatform.is64bit then
-        [ package ] ++ extraPackages
-      else
-        [ package32 ] ++ extraPackages32;
-  };
-in { home.packages = [ steam steam.run ]; }