From 61bcca0e3d0ee1c7ca119c53dd72cba18a0ddb0d Mon Sep 17 00:00:00 2001
From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com>
Date: Sun, 7 Jan 2024 15:43:08 +0100
Subject: [PATCH] Fix vr setup

---
 hosts/common/optional/gaming/steam.nix | 38 --------------------------
 hosts/common/optional/gaming/vr.nix    |  8 +++---
 pkgs/alvr/default.nix                  |  6 ++--
 3 files changed, 7 insertions(+), 45 deletions(-)

diff --git a/hosts/common/optional/gaming/steam.nix b/hosts/common/optional/gaming/steam.nix
index e24a29f..9c37ea5 100644
--- a/hosts/common/optional/gaming/steam.nix
+++ b/hosts/common/optional/gaming/steam.nix
@@ -7,45 +7,7 @@
   programs = {
     steam = {
       enable = true;
-      remotePlay.openFirewall = true;
     };
-
-    alvr = {
-      enable = true;
-      openFirewall = true;
-    };
-  };
-
-  hardware = {
-    # Enable Steam hardware compatibility
-    # steam-hardware.enable = true;
-
-    # Enable OpenGL
-    opengl = {
-      enable = true;
-      driSupport = true;
-      driSupport32Bit = true;
-      extraPackages = with pkgs; [libva-utils];
-    };
-  };
-
-  # Allow Minecraft server ports
-  networking.firewall.allowedTCPPorts = [25565];
-
-  # Fixes SteamLink/Remote play crashing, add packages necessary for VR
-  environment.systemPackages = with pkgs;
-    [libcanberra protonup-qt]
-    ++ [
-      android-tools
-      android-udev-rules
-      sidequest
-      BeatSaberModManager
-      helvum
-    ];
-
-  # Fixes issue with SteamVR not starting
-  system.activationScripts = {
-    fixSteamVR = "${pkgs.libcap}/bin/setcap CAP_SYS_NICE+ep /home/ghoscht/.local/share/Steam/steamapps/common/SteamVR/bin/linux64/vrcompositor-launcher";
   };
 
   xdg.mime = {
diff --git a/hosts/common/optional/gaming/vr.nix b/hosts/common/optional/gaming/vr.nix
index 2380ea0..1ece2ca 100644
--- a/hosts/common/optional/gaming/vr.nix
+++ b/hosts/common/optional/gaming/vr.nix
@@ -1,6 +1,6 @@
 {
-  # programs.alvr = {
-  #   enable = true;
-  #   openFirewall = true;
-  # };
+  programs.alvr = {
+    enable = true;
+    openFirewall = true;
+  };
 }
diff --git a/pkgs/alvr/default.nix b/pkgs/alvr/default.nix
index bcb25c0..b1edc45 100644
--- a/pkgs/alvr/default.nix
+++ b/pkgs/alvr/default.nix
@@ -4,10 +4,10 @@
   fetchurl,
 }: let
   pname = "alvr";
-  version = "20.5.0";
+  version = "v21.0.0-dev00+nightly.2023.12.31";
   src = fetchurl {
-    url = "https://github.com/alvr-org/ALVR/releases/download/v${version}/ALVR-x86_64.AppImage";
-    hash = "sha256-shA93fK/F+PNRv+DCTfvN+tm0w/sj/yPEYc5ms2vHRk=";
+    url = "https://github.com/alvr-org/ALVR-nightly/releases/download/v21.0.0-dev00%2Bnightly.2023.12.31/ALVR-x86_64.AppImage";
+    hash = "sha256-bRnuQGGSXd+QJGKzACgfwFOmKgk3u9JoIj6krB+HHC8=";
   };
 
   appimageContents = appimageTools.extractType2 {inherit pname version src;};