From c0a3619a6f4484154d5d4e921eeaa8e6f91238ae Mon Sep 17 00:00:00 2001
From: imterah <me@terah.dev>
Date: Sun, 8 Jun 2025 18:18:48 -0400
Subject: [PATCH] chore: Restructure submodules and add support for
 nreal-driver

---
 .gitignore                 |  1 +
 .gitmodules                | 15 +++++++++------
 evdi                       |  1 -
 modules/evdi               |  1 +
 modules/nreal-driver       |  1 +
 modules/raylib-python-cffi |  1 +
 raylib-python-cffi         |  1 -
 shell.nix                  |  7 +++++++
 8 files changed, 20 insertions(+), 8 deletions(-)
 delete mode 160000 evdi
 create mode 160000 modules/evdi
 create mode 160000 modules/nreal-driver
 create mode 160000 modules/raylib-python-cffi
 delete mode 160000 raylib-python-cffi

diff --git a/.gitignore b/.gitignore
index 9557f07..8e93e62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -278,3 +278,4 @@ dkms.conf
 
 # ---> UnrealXR
 data
+drivers
diff --git a/.gitmodules b/.gitmodules
index e7914c6..72cd7c1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,9 @@
-[submodule "evdi"]
-	path = evdi
-	url = https://github.com/DisplayLink/evdi
-[submodule "raylib-python-cffi"]
-	path = raylib-python-cffi
-	url = https://git.terah.dev/imterah/raylib-python-cffi
+[submodule "modules/raylib-python-cffi"]
+	path = modules/raylib-python-cffi
+	url = https://git.terah.dev/UnrealXR/raylib-python-cffi.git
+[submodule "modules/evdi"]
+	path = modules/evdi
+	url = https://github.com/DisplayLink/evdi.git
+[submodule "modules/nreal-driver"]
+	path = modules/nreal-driver
+	url = https://git.terah.dev/UnrealXR/nrealAirLinuxDriver.git
diff --git a/evdi b/evdi
deleted file mode 160000
index 600ed43..0000000
--- a/evdi
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 600ed4342a7251d4575ee4810756649f9e77cdf0
diff --git a/modules/evdi b/modules/evdi
new file mode 160000
index 0000000..3673a4b
--- /dev/null
+++ b/modules/evdi
@@ -0,0 +1 @@
+Subproject commit 3673a4b34d386921fc323ddbd2ef0e000022e2d4
diff --git a/modules/nreal-driver b/modules/nreal-driver
new file mode 160000
index 0000000..682daf4
--- /dev/null
+++ b/modules/nreal-driver
@@ -0,0 +1 @@
+Subproject commit 682daf43853702b61df02d12ed3870937f528107
diff --git a/modules/raylib-python-cffi b/modules/raylib-python-cffi
new file mode 160000
index 0000000..249b5b7
--- /dev/null
+++ b/modules/raylib-python-cffi
@@ -0,0 +1 @@
+Subproject commit 249b5b7c3548cae12d998933de8b70a8b99a50cd
diff --git a/raylib-python-cffi b/raylib-python-cffi
deleted file mode 160000
index 1e195e4..0000000
--- a/raylib-python-cffi
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1e195e4ac9b1dcd834fcf9c3d7bfc4e91bc10ecc
diff --git a/shell.nix b/shell.nix
index 589c090..5c22d4a 100644
--- a/shell.nix
+++ b/shell.nix
@@ -23,6 +23,13 @@
     xorg.libXrandr
     xorg.libXinerama
     xorg.libX11
+
+    # nreal driver build dependencies
+    hidapi
+    json_c
+    udev
+    libusb1
+    opencv
   ];
 
   shellHook = ''