From 67a9b2a4c08f3018f9407b011e5816d373d9a70d Mon Sep 17 00:00:00 2001
From: pager <abby@abby.cafe>
Date: Mon, 3 Nov 2025 22:19:15 -0500
Subject: [PATCH] Move monado custom branch to vr-overlay.nix

---
 configuration.nix | 19 +++----------------
 vr-overlay.nix    | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 88f0fc2..ba9ca15 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -168,24 +168,11 @@
     usbutils
 
 
-#    lemonake.packages.${pkgs.system}.wayvr-dashboard-git
+    #    lemonake.packages.${pkgs.system}.wayvr-dashboard-git
+
+    monado
 
-    (monado.overrideAttrs (oldAttrs: rec {
 
-      src = fetchFromGitLab {
-        domain = "gitlab.freedesktop.org";
-        owner = "monado";
-        repo = "monado";
-        rev = "5c137fe28b232fe460f9b03defa7749adc32ee48";
-        hash = "sha256-4P/ejRAitrYn8hXZPaDOcx27utfm+aVLjtqL6JxZYAg=";
-      };
-      patches = [];
-      #   (pkgs.fetchpatch {
-      #     url = "https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2425.diff";
-      #     sha256 = "0hhfk86z1yq5gn9bzqpv46nb9bdx3fygi55b4ayzmnamva7rcajp";
-      #   })
-      # ];
-    }))
   ];
 
 
diff --git a/vr-overlay.nix b/vr-overlay.nix
index 0cc38f6..8fd5ff2 100644
--- a/vr-overlay.nix
+++ b/vr-overlay.nix
@@ -16,6 +16,22 @@
         };
         patches = [];
       });
+
+      monado = prev.monado.overrideAttrs (oldAttrs: rec {
+        src = final.fetchgit {
+          url = "https://tangled.org/@matrixfurry.com/monado";
+          rev = "f689a3cf";
+          hash = "sha256-WBC+1+01U/2kvHYflqZczRW4rDAcOqsAPalGo8Yg3EI=";
+        };
+        # src = fetchFromGitLab {
+        #   domain = "gitlab.freedesktop.org";
+        #   owner = "monado";
+        #   repo = "monado";
+        #   rev = "5c137fe28b232fe460f9b03defa7749adc32ee48";
+        #   hash = "sha256-4P/ejRAitrYn8hXZPaDOcx27utfm+aVLjtqL6JxZYAg=";
+        # };
+        patches = [];
+      });
     })
   ];
 }