diff --git a/.gitignore b/.gitignore
index c1a18b4..d3eb490 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 /result
 **/result
 result
+
+.envrc
+.direnv
diff --git a/_sources/generated.json b/_sources/generated.json
index b559ca2..e364d00 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -1,7 +1,7 @@
 {
     "ath-tools": {
         "cargoLock": null,
-        "date": "2026-03-03",
+        "date": "2026-04-15",
         "extract": null,
         "name": "ath-tools",
         "passthru": null,
@@ -11,17 +11,17 @@
             "fetchSubmodules": false,
             "leaveDotGit": false,
             "name": null,
-            "rev": "c8182015b0ec81da1d4c39841aca190deae77c2c",
-            "sha256": "sha256-Va845WLEyB+l7cpLIvYpvwOyMZuLKcb3Afqqs/cUSmI=",
+            "rev": "324903e86fbd30d601f404125da74b28d812be4b",
+            "sha256": "sha256-Gykx/uHPzbHPECtiCoRmo9YWxUpYc7Ky1lNBENLsRm4=",
             "sparseCheckout": [],
             "type": "git",
             "url": "https://github.com/qca/qca-swiss-army-knife.git"
         },
-        "version": "c8182015b0ec81da1d4c39841aca190deae77c2c"
+        "version": "324903e86fbd30d601f404125da74b28d812be4b"
     },
     "base24-schemes": {
         "cargoLock": null,
-        "date": "2026-04-12",
+        "date": "2026-05-03",
         "extract": null,
         "name": "base24-schemes",
         "passthru": null,
@@ -31,13 +31,13 @@
             "fetchSubmodules": false,
             "leaveDotGit": false,
             "name": null,
-            "rev": "3e228732e93c107e8b65b8be30c36e5b3c507d95",
-            "sha256": "sha256-G34G4hri8H2XNwF0e15MFj3sjO8fTOphNk0WjBwnVew=",
+            "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795",
+            "sha256": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=",
             "sparseCheckout": [],
             "type": "git",
             "url": "https://github.com/tinted-theming/schemes.git"
         },
-        "version": "3e228732e93c107e8b65b8be30c36e5b3c507d95"
+        "version": "0c94645546f4f3ddac77a1a5fce54eb95bf50795"
     },
     "claude-code-acp": {
         "cargoLock": null,
@@ -53,12 +53,12 @@
             "name": null,
             "owner": "zed-industries",
             "repo": "claude-code-acp",
-            "rev": "v0.26.0",
-            "sha256": "sha256-2G8gjMCnk3W1I2+4sNsumL15ts9bLXAOMguCmwnzWSA=",
+            "rev": "v0.35.0",
+            "sha256": "sha256-xb6D4J+EmbK5XCrZCyv1LWYdfmaNDcw7Hk4nHg76uAo=",
             "sparseCheckout": [],
             "type": "github"
         },
-        "version": "v0.26.0"
+        "version": "v0.35.0"
     },
     "flightcore": {
         "cargoLock": null,
@@ -84,27 +84,27 @@
     "neovide": {
         "cargoLock": {
             "Cargo.lock": [
-                "sha256-JBV939TEfG44w59iUJ3KgiCrQ9aCcjmPxu2uoBD_Ank=/Cargo.lock",
+                "sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock",
                 {}
             ]
         },
-        "date": null,
+        "date": "2026-05-16",
         "extract": null,
         "name": "neovide",
         "passthru": null,
         "pinned": false,
         "src": {
-            "deepClone": true,
-            "fetchSubmodules": true,
+            "deepClone": false,
+            "fetchSubmodules": false,
             "leaveDotGit": false,
             "name": null,
-            "rev": "nightly",
-            "sha256": "sha256-JBV939TEfG44w59iUJ3KgiCrQ9aCcjmPxu2uoBD/Ank=",
+            "rev": "8c48a699e201aa5559227a96d879b2f57192b354",
+            "sha256": "sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3/pU7iOBpBOC0Dvw=",
             "sparseCheckout": [],
             "type": "git",
             "url": "https://github.com/neovide/neovide.git"
         },
-        "version": "nightly"
+        "version": "8c48a699e201aa5559227a96d879b2f57192b354"
     },
     "qebspil": {
         "cargoLock": null,
@@ -140,12 +140,12 @@
             "name": null,
             "owner": "radareorg",
             "repo": "r2ghidra",
-            "rev": "6.1.2",
-            "sha256": "sha256-bGA7izBSvlwnD4BZXNucYS39BDdmo+49cY3o4LjIpYM=",
+            "rev": "6.1.4",
+            "sha256": "sha256-uVMsONXethTq/BL9MBQkDP3iJ6t25PEnpeD/Y17dpxM=",
             "sparseCheckout": [],
             "type": "github"
         },
-        "version": "6.1.2"
+        "version": "6.1.4"
     },
     "radare2-mcp": {
         "cargoLock": null,
@@ -161,12 +161,12 @@
             "name": null,
             "owner": "radareorg",
             "repo": "radare2-mcp",
-            "rev": "1.7.2",
-            "sha256": "sha256-ToSvRmgOyrmsFWjfwuDit5hLXYJQD7YKGoy2utkqUe0=",
+            "rev": "1.8.0",
+            "sha256": "sha256-1tV3mG1hEIcq18cHn5kS4n9ocVZsHQ5A4TCTA3OKzn8=",
             "sparseCheckout": [],
             "type": "github"
         },
-        "version": "1.7.2"
+        "version": "1.8.0"
     },
     "slbounce": {
         "cargoLock": null,
diff --git a/_sources/generated.nix b/_sources/generated.nix
index 698f795..164ff1e 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -4,44 +4,45 @@
   fetchurl,
   fetchFromGitHub,
   dockerTools,
-}: {
+}:
+{
   ath-tools = {
     pname = "ath-tools";
-    version = "c8182015b0ec81da1d4c39841aca190deae77c2c";
+    version = "324903e86fbd30d601f404125da74b28d812be4b";
     src = fetchgit {
       url = "https://github.com/qca/qca-swiss-army-knife.git";
-      rev = "c8182015b0ec81da1d4c39841aca190deae77c2c";
+      rev = "324903e86fbd30d601f404125da74b28d812be4b";
       fetchSubmodules = false;
       deepClone = false;
       leaveDotGit = false;
-      sparseCheckout = [];
-      sha256 = "sha256-Va845WLEyB+l7cpLIvYpvwOyMZuLKcb3Afqqs/cUSmI=";
+      sparseCheckout = [ ];
+      sha256 = "sha256-Gykx/uHPzbHPECtiCoRmo9YWxUpYc7Ky1lNBENLsRm4=";
     };
-    date = "2026-03-03";
+    date = "2026-04-15";
   };
   base24-schemes = {
     pname = "base24-schemes";
-    version = "3e228732e93c107e8b65b8be30c36e5b3c507d95";
+    version = "0c94645546f4f3ddac77a1a5fce54eb95bf50795";
     src = fetchgit {
       url = "https://github.com/tinted-theming/schemes.git";
-      rev = "3e228732e93c107e8b65b8be30c36e5b3c507d95";
+      rev = "0c94645546f4f3ddac77a1a5fce54eb95bf50795";
       fetchSubmodules = false;
       deepClone = false;
       leaveDotGit = false;
-      sparseCheckout = [];
-      sha256 = "sha256-G34G4hri8H2XNwF0e15MFj3sjO8fTOphNk0WjBwnVew=";
+      sparseCheckout = [ ];
+      sha256 = "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=";
     };
-    date = "2026-04-12";
+    date = "2026-05-03";
   };
   claude-code-acp = {
     pname = "claude-code-acp";
-    version = "v0.26.0";
+    version = "v0.35.0";
     src = fetchFromGitHub {
       owner = "zed-industries";
       repo = "claude-code-acp";
-      rev = "v0.26.0";
+      rev = "v0.35.0";
       fetchSubmodules = false;
-      sha256 = "sha256-2G8gjMCnk3W1I2+4sNsumL15ts9bLXAOMguCmwnzWSA=";
+      sha256 = "sha256-xb6D4J+EmbK5XCrZCyv1LWYdfmaNDcw7Hk4nHg76uAo=";
     };
   };
   flightcore = {
@@ -57,21 +58,23 @@
   };
   neovide = {
     pname = "neovide";
-    version = "nightly";
+    version = "8c48a699e201aa5559227a96d879b2f57192b354";
     src = fetchgit {
       url = "https://github.com/neovide/neovide.git";
-      rev = "nightly";
-      fetchSubmodules = true;
-      deepClone = true;
+      rev = "8c48a699e201aa5559227a96d879b2f57192b354";
+      fetchSubmodules = false;
+      deepClone = false;
       leaveDotGit = false;
-      sparseCheckout = [];
-      sha256 = "sha256-JBV939TEfG44w59iUJ3KgiCrQ9aCcjmPxu2uoBD/Ank=";
+      sparseCheckout = [ ];
+      sha256 = "sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3/pU7iOBpBOC0Dvw=";
     };
     cargoLock."Cargo.lock" = {
-      lockFile = ./. + "/sha256-JBV939TEfG44w59iUJ3KgiCrQ9aCcjmPxu2uoBD_Ank=/Cargo.lock";
+      lockFile = ./. + "/sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock";
       outputHashes = {
+        
       };
     };
+    date = "2026-05-16";
   };
   qebspil = {
     pname = "qebspil";
@@ -82,31 +85,31 @@
       fetchSubmodules = true;
       deepClone = false;
       leaveDotGit = false;
-      sparseCheckout = [];
+      sparseCheckout = [ ];
       sha256 = "sha256-kWUXzeYWNxGgmjt/p9yozrWc5ouUs0XXBRfiFMlu+QQ=";
     };
     date = "2025-10-25";
   };
   radare2-ghidra = {
     pname = "radare2-ghidra";
-    version = "6.1.2";
+    version = "6.1.4";
     src = fetchFromGitHub {
       owner = "radareorg";
       repo = "r2ghidra";
-      rev = "6.1.2";
+      rev = "6.1.4";
       fetchSubmodules = false;
-      sha256 = "sha256-bGA7izBSvlwnD4BZXNucYS39BDdmo+49cY3o4LjIpYM=";
+      sha256 = "sha256-uVMsONXethTq/BL9MBQkDP3iJ6t25PEnpeD/Y17dpxM=";
     };
   };
   radare2-mcp = {
     pname = "radare2-mcp";
-    version = "1.7.2";
+    version = "1.8.0";
     src = fetchFromGitHub {
       owner = "radareorg";
       repo = "radare2-mcp";
-      rev = "1.7.2";
+      rev = "1.8.0";
       fetchSubmodules = false;
-      sha256 = "sha256-ToSvRmgOyrmsFWjfwuDit5hLXYJQD7YKGoy2utkqUe0=";
+      sha256 = "sha256-1tV3mG1hEIcq18cHn5kS4n9ocVZsHQ5A4TCTA3OKzn8=";
     };
   };
   slbounce = {
diff --git a/_sources/sha256-JBV939TEfG44w59iUJ3KgiCrQ9aCcjmPxu2uoBD_Ank=/Cargo.lock b/_sources/sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock
similarity index 99%
rename from _sources/sha256-JBV939TEfG44w59iUJ3KgiCrQ9aCcjmPxu2uoBD_Ank=/Cargo.lock
rename to _sources/sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock
index 8cadf31..666006b 100644
--- a/_sources/sha256-JBV939TEfG44w59iUJ3KgiCrQ9aCcjmPxu2uoBD_Ank=/Cargo.lock
+++ b/_sources/sha256-Ke8bM5o33s1h1fHY7Y10fYKpVwS3_pU7iOBpBOC0Dvw=/Cargo.lock
@@ -1593,7 +1593,7 @@ dependencies = [
 
 [[package]]
 name = "neovide"
-version = "0.16.1"
+version = "0.16.2"
 dependencies = [
  "anyhow",
  "approx",
@@ -2579,9 +2579,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.12.2"
+version = "1.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
+checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2849,9 +2849,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "skia-bindings"
-version = "0.93.1"
+version = "0.97.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2359f7e30c9da3f322f8ca3d4ec0abbc12a40035ce758309db0cdab07b5d4476"
+checksum = "d6e3bcf8f25bf047e83110838463e8d06696c12fccc3d3794adf448b4d81f34b"
 dependencies = [
  "bindgen",
  "cc",
@@ -2866,9 +2866,9 @@ dependencies = [
 
 [[package]]
 name = "skia-safe"
-version = "0.93.1"
+version = "0.97.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e837ea9d531c9efee8f980bfcdb7226b21db0285b0c3171d8be745829f940"
+checksum = "935d4d174fb749bac9265eb41cad75039d32fda2d9c1a1e81b430df0e210a409"
 dependencies = [
  "bitflags 2.10.0",
  "skia-bindings",
@@ -3051,9 +3051,9 @@ dependencies = [
 
 [[package]]
 name = "tar"
-version = "0.4.44"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a"
+checksum = "22692a6476a21fa75fdfc11d452fda482af402c008cdbaf3476414e122040973"
 dependencies = [
  "filetime",
  "libc",
@@ -3070,7 +3070,7 @@ dependencies = [
  "getrandom 0.3.4",
  "once_cell",
  "rustix 1.1.2",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3341,9 +3341,9 @@ dependencies = [
 
 [[package]]
 name = "tracy-client-sys"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fb391ac70462b3097a755618fbf9c8f95ecc1eb379a414f7b46f202ed10db1f"
+checksum = "c5f7c95348f20c1c913d72157b3c6dee6ea3e30b3d19502c5a7f6d3f160dacbf"
 dependencies = [
  "cc",
  "windows-targets 0.52.6",
@@ -3689,7 +3689,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
diff --git a/nvfetcher.toml b/nvfetcher.toml
index 4f2f7d2..0674d8e 100644
--- a/nvfetcher.toml
+++ b/nvfetcher.toml
@@ -32,8 +32,7 @@ src.git = "https://github.com/qca/qca-swiss-army-knife.git"
 fetch.git = "https://github.com/qca/qca-swiss-army-knife.git"
 
 [neovide]
-src.manual = "nightly"
+src.git = "https://github.com/neovide/neovide.git"
+src.git_branch = "nightly"
 fetch.git = "https://github.com/neovide/neovide.git"
-git.fetchSubmodules = true
-git.deepClone = true
 cargo_lock = ["Cargo.lock"]
diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix
index a4d6852..29ecbdd 100644
--- a/pkgs/by-name/ne/neovide/package.nix
+++ b/pkgs/by-name/ne/neovide/package.nix
@@ -44,8 +44,8 @@ in
           owner = "rust-skia";
           repo = "skia";
           # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
-          tag = "m145-0.92.0";
-          hash = "sha256-9N780AwheKBJRcZC4l/uWFNq+oOyoNp4M6dJAVVAFeo=";
+          tag = "m148-0.97.0";
+          hash = "sha256-uFnYX6ZDg+cJwLyCe6IGB6M3aCyI/+q2aYP4JfHm544=";
         };
         # The externals for skia are taken from skia/DEPS
         externals = linkFarm "skia-externals" (
diff --git a/pkgs/by-name/ne/neovide/skia-externals.json b/pkgs/by-name/ne/neovide/skia-externals.json
index 226e3f1..b82e5ff 100644
--- a/pkgs/by-name/ne/neovide/skia-externals.json
+++ b/pkgs/by-name/ne/neovide/skia-externals.json
@@ -1,8 +1,8 @@
 {
   "expat": {
     "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git",
-    "rev": "8e49998f003d693213b538ef765814c7d21abada",
-    "sha256": "sha256-zP2kiB4nyLi0/I8OsRhxKG0qRGPe2ALLQ+HHfqlBJ6Y="
+    "rev": "6154446fccefbf3ca644894f598969113b0c7bcd",
+    "sha256": "sha256-ifMDdEWu9H8iJ/VSKuXlisJKx1s1F8ecT74bwXnBWcA="
   },
   "libjpeg-turbo": {
     "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
@@ -21,8 +21,8 @@
   },
   "harfbuzz": {
     "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
-    "rev": "31695252eb6ed25096893aec7f848889dad874bc",
-    "sha256": "sha256-Csyz08JTNXfY2fo27x1Eg1CqO/tt8Rt9udr3KflojSg="
+    "rev": "9cb1fee51069b206effb4736e443b038d230789d",
+    "sha256": "sha256-EYItQuWvB4q2Q2iJfMyEtX9MTm3rEFlcwZ+NQEAVy0M="
   },
   "wuffs": {
     "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -31,7 +31,7 @@
   },
   "libpng": {
     "url": "https://skia.googlesource.com/third_party/libpng.git",
-    "rev": "4e3f57d50f552841550a36eabbb3fbcecacb7750",
-    "sha256": "sha256-tNRrA9RUp6Mi7dbIB/70a/4tn/JxAsTUb9EI9nlXLjM="
+    "rev": "d5515b5b8be3901aac04e5bd8bd5c89f287bcd33",
+    "sha256": "sha256-N507gFyjXXsJ3dyQN0SlVy80WXlbNlZs/cnqLaCmFTk="
   }
 }