From 44d18ff827a6b33ef218a74a4c1f33c89f940925 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Fri, 20 Jun 2025 23:18:57 -0400
Subject: [PATCH] Fix OBS, use OOYE fork

---
 flake.lock                   | 12 ++++++------
 flake.nix                    |  2 +-
 modules/desktop/obs.nix      | 19 +++++++++++++++++++
 modules/desktop/packages.nix |  2 +-
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 16c0abf..707f0e6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -829,17 +829,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1749767813,
-        "narHash": "sha256-1vMSz6xcGc90rDo5BVdB/e6hbP+RrovyGNXhaUWrVKU=",
+        "lastModified": 1750475211,
+        "narHash": "sha256-M+qvH/Z4yl4SfEdce8egsm01NpLzUBT/bMWjcm5CL4Y=",
         "ref": "refs/heads/master",
-        "rev": "fe1e8f28844350efdce4b15342e69c82b1e3369a",
-        "revCount": 12,
+        "rev": "616ca2d32b610066d0dcf12496baa46f718dbdcd",
+        "revCount": 14,
         "type": "git",
-        "url": "https://cgit.rory.gay/nix/OOYE-module.git"
+        "url": "https://git.federated.nexus/Henry-Hiles/OOYE-module"
       },
       "original": {
         "type": "git",
-        "url": "https://cgit.rory.gay/nix/OOYE-module.git"
+        "url": "https://git.federated.nexus/Henry-Hiles/OOYE-module"
       }
     },
     "programsdb": {
diff --git a/flake.nix b/flake.nix
index ae5c8cd..5e91574 100755
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ooye = {
-      url = "git+https://cgit.rory.gay/nix/OOYE-module.git";
+      url = "git+https://git.federated.nexus/Henry-Hiles/OOYE-module";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     matrixoidc = {
diff --git a/modules/desktop/obs.nix b/modules/desktop/obs.nix
index 77d52dc..59c23d1 100644
--- a/modules/desktop/obs.nix
+++ b/modules/desktop/obs.nix
@@ -1,6 +1,25 @@
 {pkgs, ...}: {
   programs.obs-studio = {
     enable = true;
+    # TODO: For virtual camera, remove on new OBS release
+    package = pkgs.obs-studio.overrideAttrs (oldAttrs: {
+      src = pkgs.fetchFromGitHub {
+        owner = "obsproject";
+        repo = "obs-studio";
+        rev = "12c6febae21f369da50f09d511b54eadc1dc1342"; # https://github.com/obsproject/obs-studio/pull/11906
+        sha256 = "sha256-DIlAMCdve7wfbMV5YCd3qJnZ2xwJMmQD6LamGP7ECOA=";
+        fetchSubmodules = true;
+      };
+      version = "31.1.0-beta1";
+      patches =
+        builtins.filter (
+          patch:
+            !(
+              builtins.baseNameOf (toString patch) == "Enable-file-access-and-universal-access-for-file-URL.patch"
+            )
+        )
+        oldAttrs.patches;
+    });
     plugins = with pkgs.obs-studio-plugins; [obs-pipewire-audio-capture];
     enableVirtualCamera = true;
   };
diff --git a/modules/desktop/packages.nix b/modules/desktop/packages.nix
index 72ab9a6..ed124cd 100644
--- a/modules/desktop/packages.nix
+++ b/modules/desktop/packages.nix
@@ -19,7 +19,7 @@
     wl-clipboard
     prismlauncher
     authenticator
-    nexusmods-app-unfree
+    # nexusmods-app-unfree
     hunspellDicts.en_CA-large
   ];
 }