From 6437bd375a1a6cc8b65064d2b58b7da86d70cc9a Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Mon, 17 Mar 2025 15:34:54 -0400
Subject: [PATCH] vr fix

---
 etcnixos/flake.lock          |  6 +++---
 etcnixos/vr.nix              |  9 ++++++++-
 home-manager/flake.lock      | 12 ++++++------
 home-manager/system-yarn.nix | 23 +----------------------
 4 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock
index 3290937..7e89c9c 100644
--- a/etcnixos/flake.lock
+++ b/etcnixos/flake.lock
@@ -34,11 +34,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742213066,
-        "narHash": "sha256-zQHn+4moKz4XTf1qvGEi9eVABikPdnwFfOotqk9QMwE=",
+        "lastModified": 1742229917,
+        "narHash": "sha256-ldvWOI1F90HBTvJBkF/09d8GLgWnIPlKpkNYotmu2wY=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "be765082e305296cc99dc2f2ed031b1d10133233",
+        "rev": "5104a4c520e33bf59468875ab58d9ad37431a5bb",
         "type": "github"
       },
       "original": {
diff --git a/etcnixos/vr.nix b/etcnixos/vr.nix
index fbfd264..e1b28e1 100644
--- a/etcnixos/vr.nix
+++ b/etcnixos/vr.nix
@@ -5,11 +5,18 @@
   ...
 }:
 {
+
   services.wivrn = {
     enable = true;
     openFirewall = true;
 
-    package = pkgs.wivrn;
+    package = (
+      pkgs.wivrn.overrideAttrs (old: {
+        cmakeFlags = old.cmakeFlags ++ [
+          (lib.cmakeFeature "OPENCOMPOSITE_SEARCH_PATH" "${pkgs.opencomposite}/lib/opencomposite")
+        ];
+      })
+    );
 
     # Write information to /etc/xdg/openxr/1/active_runtime.json, VR applications
     # will automatically read this and work with wivrn
diff --git a/home-manager/flake.lock b/home-manager/flake.lock
index 96a1c4e..8a3acd5 100644
--- a/home-manager/flake.lock
+++ b/home-manager/flake.lock
@@ -54,11 +54,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741955947,
-        "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=",
+        "lastModified": 1742238842,
+        "narHash": "sha256-Z79yUJi+UGSpRC90NbHyuvBjGLkgEtlZaJ8DtzaGkzE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4",
+        "rev": "5a6e5a59a4d332edaa7d5d1604eb58ead27af851",
         "type": "github"
       },
       "original": {
@@ -242,11 +242,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742180312,
-        "narHash": "sha256-67nyifSJu0TnXReokhA+pQhqswg0ZOp033k+QboSL8s=",
+        "lastModified": 1742239259,
+        "narHash": "sha256-khFVyLv9bjmWS5wKxgRqR0T/8b+5YUcOKKQc8cSIaZs=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "4dd2f79d89dc0ebbb1b3ebf96776383cc6d6989a",
+        "rev": "047d2684da0cf2d1a1db02eece61c90ce9dda32b",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/system-yarn.nix b/home-manager/system-yarn.nix
index ba456d5..831f6bf 100644
--- a/home-manager/system-yarn.nix
+++ b/home-manager/system-yarn.nix
@@ -10,7 +10,7 @@
 
   home.packages = with pkgs; [
     protontricks
-    # beatsabermodmanager
+    beatsabermodmanager
   ];
 
   programs.alacritty.settings = {
@@ -26,25 +26,4 @@
       obs-pipewire-audio-capture
     ];
   };
-
-  # https://wiki.nixos.org/wiki/VR
-  xdg.configFile."openvr/openvrpaths.vrpath".text = ''
-    {
-      "config" :
-      [
-        "${config.xdg.dataHome}/Steam/config"
-      ],
-      "external_drivers" : null,
-      "jsonid" : "vrpathreg",
-      "log" :
-      [
-        "${config.xdg.dataHome}/Steam/logs"
-      ],
-      "runtime" :
-      [
-        "${pkgs.opencomposite}/lib/opencomposite"
-      ],
-      "version" : 1
-    }
-  '';
 }