diff --git a/README.md b/README.md
index d948e4b..fa54ec8 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,11 @@ The `nixpkgs` `nvim-treesitter` plugin is not well equipped to handle the migrat
 
 **nvim-treesitter-main** is a flake that builds the new `main` branch `nvim-treesitter`, along with all of the parser versions from the [`parsers.lua`](https://github.com/nvim-treesitter/nvim-treesitter/blob/main/lua/nvim-treesitter/parsers.lua) file, as recommended by the project.
 
+## Deprecation
+The `nvim-treesitter` main branch was merged into [nixpkgs](https://github.com/NixOS/nixpkgs/pull/470883) in late 2025.
+
+This flake will stay maintained (new grammar versions) in the medium-term, but you should look to move to the nixpkgs version - it's far simpler and more correct.
+
 ## Usage
 
 ** See below if you also plan to install tree-sitter grammars **
diff --git a/flake.lock b/flake.lock
index 7f2cc71..cc1c647 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1769461804,
-        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+        "lastModified": 1770197578,
+        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
+        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
         "type": "github"
       },
       "original": {
@@ -19,11 +19,11 @@
     "nvim-treesitter": {
       "flake": false,
       "locked": {
-        "lastModified": 1769854724,
-        "narHash": "sha256-pwI9KqCjymvqK6btX/+5ZiGP46JsQVYj7W+9YtlRXsc=",
+        "lastModified": 1770448302,
+        "narHash": "sha256-c8twdp6ASjV/wiwSzau3xrk8d9fIwQwM6lsL4mo5TQ4=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter",
-        "rev": "4967fa48b0fe7a7f92cee546c76bb4bb61bb14d5",
+        "rev": "45a07f869b0cffba342276f2c77ba7c116d35db8",
         "type": "github"
       },
       "original": {
diff --git a/generated.nix b/generated.nix
index ae163dd..3806531 100644
--- a/generated.nix
+++ b/generated.nix
@@ -1593,12 +1593,12 @@
   javadoc = buildGrammar {
     passthru.name = "javadoc";
     language = "javadoc";
-    version = "0.0.0+rev=141525e73c9ad2fe7df8861047d4068ddbb6c337";
+    version = "0.0.0+rev=d1a2efc871825ff29a1d241cdcac5713c99cfd54";
     src = fetchFromGitHub {
       owner = "rmuir";
       repo = "tree-sitter-javadoc";
-      rev = "141525e73c9ad2fe7df8861047d4068ddbb6c337";
-      hash = "sha256-4hWjeOItZRp07D0GFqz9znkgkLtt3iO3sv61B62JkiA=";
+      rev = "d1a2efc871825ff29a1d241cdcac5713c99cfd54";
+      hash = "sha256-E/84o/2FO3TAbQhk0CMvdEPG9i5W1BwvQGUhg60lBv4=";
     };
     meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
   };
@@ -1720,12 +1720,12 @@
   just = buildGrammar {
     passthru.name = "just";
     language = "just";
-    version = "0.0.0+rev=7333f8c150aaac5bb46decc2d225a2d4cde8c51e";
+    version = "0.0.0+rev=fe94f5230d97ff9fc7bee8c57e650dff615ed7cc";
     src = fetchFromGitHub {
       owner = "IndianBoy42";
       repo = "tree-sitter-just";
-      rev = "7333f8c150aaac5bb46decc2d225a2d4cde8c51e";
-      hash = "sha256-YzXQGcWfTMvCP7fDvQ4gGCtb4tl3r88W7bQSQhUxtyQ=";
+      rev = "fe94f5230d97ff9fc7bee8c57e650dff615ed7cc";
+      hash = "sha256-H8aAmI8/D2/3eeR4Nn/q8JNPbJjKEyV6/QX608Ikbm4=";
     };
     meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just";
   };
@@ -1792,12 +1792,12 @@
   kotlin = buildGrammar {
     passthru.name = "kotlin";
     language = "kotlin";
-    version = "0.0.0+rev=57fb4560ba8641865bc0baa6b3f413b236112c4c";
+    version = "0.0.0+rev=6b9788578ae23a1bc7c87e8d564e0daf7671dee3";
     src = fetchFromGitHub {
       owner = "fwcd";
       repo = "tree-sitter-kotlin";
-      rev = "57fb4560ba8641865bc0baa6b3f413b236112c4c";
-      hash = "sha256-CA4bfWE3YkvC4v21EXdjJ2SD7mIWJbuGpnyvRwFgm8M=";
+      rev = "6b9788578ae23a1bc7c87e8d564e0daf7671dee3";
+      hash = "sha256-WfFcXtJS5gtpp73as1lrAb4GLn8r5F/PNw4xAIWs+hw=";
     };
     meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
   };
@@ -1998,12 +1998,12 @@
   markdown = buildGrammar {
     passthru.name = "markdown";
     language = "markdown";
-    version = "0.0.0+rev=da063e1ba4303ff08781eb440cc9a7bd41e55dd8";
+    version = "0.0.0+rev=bd2d09ecdbd36289bb7185c8751bbf14c5afe838";
     src = fetchFromGitHub {
       owner = "tree-sitter-grammars";
       repo = "tree-sitter-markdown";
-      rev = "da063e1ba4303ff08781eb440cc9a7bd41e55dd8";
-      hash = "sha256-YX8XCL7brkiep4UIShRxIG8aVz8FFjpSH7cKKUQ0Cio=";
+      rev = "bd2d09ecdbd36289bb7185c8751bbf14c5afe838";
+      hash = "sha256-rlw/8L3UmKB3708BDALDBkKxlWrMyWSjplpt60MUoFo=";
     };
     meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-markdown";
     location = "tree-sitter-markdown";
@@ -2012,12 +2012,12 @@
   markdown_inline = buildGrammar {
     passthru.name = "markdown_inline";
     language = "markdown_inline";
-    version = "0.0.0+rev=da063e1ba4303ff08781eb440cc9a7bd41e55dd8";
+    version = "0.0.0+rev=bd2d09ecdbd36289bb7185c8751bbf14c5afe838";
     src = fetchFromGitHub {
       owner = "tree-sitter-grammars";
       repo = "tree-sitter-markdown";
-      rev = "da063e1ba4303ff08781eb440cc9a7bd41e55dd8";
-      hash = "sha256-YX8XCL7brkiep4UIShRxIG8aVz8FFjpSH7cKKUQ0Cio=";
+      rev = "bd2d09ecdbd36289bb7185c8751bbf14c5afe838";
+      hash = "sha256-rlw/8L3UmKB3708BDALDBkKxlWrMyWSjplpt60MUoFo=";
     };
     meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-markdown";
     location = "tree-sitter-markdown-inline";
@@ -2025,12 +2025,12 @@
   matlab = buildGrammar {
     passthru.name = "matlab";
     language = "matlab";
-    version = "0.0.0+rev=f29f784107722e237e188bec333d4779082a2db1";
+    version = "0.0.0+rev=574dde565caddf8cf44eec7df3cb89eb96053ed7";
     src = fetchFromGitHub {
       owner = "acristoffers";
       repo = "tree-sitter-matlab";
-      rev = "f29f784107722e237e188bec333d4779082a2db1";
-      hash = "sha256-YkYV/VRxPjuIKl3FfwGL+kpK+Hoc1NxuflcYnSGXAVc=";
+      rev = "574dde565caddf8cf44eec7df3cb89eb96053ed7";
+      hash = "sha256-gDecX1QrM6VhR/bIcHMtm7qBcmKq9KPu1OPbo0zCO1A=";
     };
     meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab";
   };
@@ -2073,12 +2073,12 @@
   mlir = buildGrammar {
     passthru.name = "mlir";
     language = "mlir";
-    version = "0.0.0+rev=d989734f56e86c4949a4e74b39d573db8528efa0";
+    version = "0.0.0+rev=a547cb73d7c6373e77692bb7739e670b5de60f86";
     src = fetchFromGitHub {
       owner = "artagnon";
       repo = "tree-sitter-mlir";
-      rev = "d989734f56e86c4949a4e74b39d573db8528efa0";
-      hash = "sha256-dXyqe6R387L2bUYNOP7oRuH+tKui5tppK9x92OsCXvA=";
+      rev = "a547cb73d7c6373e77692bb7739e670b5de60f86";
+      hash = "sha256-9ZmXquoJw2Sh9QyLnvHGxhvGmFeZdacn0+arw8VVZhA=";
     };
     meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
     generate = true;
@@ -2332,12 +2332,12 @@
   php = buildGrammar {
     passthru.name = "php";
     language = "php";
-    version = "0.0.0+rev=7d07b41ce2d442ca9a90ed85d0075eccc17ae315";
+    version = "0.0.0+rev=015ce839db5ae9ceda763bf12e071867fbe8cc89";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-php";
-      rev = "7d07b41ce2d442ca9a90ed85d0075eccc17ae315";
-      hash = "sha256-XEKlsqC7HJ3mShmcwmfpezNP9DHE8f73f7/ru4MuxEo=";
+      rev = "015ce839db5ae9ceda763bf12e071867fbe8cc89";
+      hash = "sha256-fi4J7/AdV0wcpCg4gqmaE2epN51G4x4V5OHh7WtzGac=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
     location = "php";
@@ -2346,12 +2346,12 @@
   php_only = buildGrammar {
     passthru.name = "php_only";
     language = "php_only";
-    version = "0.0.0+rev=7d07b41ce2d442ca9a90ed85d0075eccc17ae315";
+    version = "0.0.0+rev=015ce839db5ae9ceda763bf12e071867fbe8cc89";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-php";
-      rev = "7d07b41ce2d442ca9a90ed85d0075eccc17ae315";
-      hash = "sha256-XEKlsqC7HJ3mShmcwmfpezNP9DHE8f73f7/ru4MuxEo=";
+      rev = "015ce839db5ae9ceda763bf12e071867fbe8cc89";
+      hash = "sha256-fi4J7/AdV0wcpCg4gqmaE2epN51G4x4V5OHh7WtzGac=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
     location = "php_only";
@@ -2383,12 +2383,12 @@
   pkl = buildGrammar {
     passthru.name = "pkl";
     language = "pkl";
-    version = "0.0.0+rev=57ed643ffd6b4f12c6f829cd3268e9ad216e2c30";
+    version = "0.0.0+rev=0be2b56dec91cf03d6b653dcbb24188dd5c44dd6";
     src = fetchFromGitHub {
       owner = "apple";
       repo = "tree-sitter-pkl";
-      rev = "57ed643ffd6b4f12c6f829cd3268e9ad216e2c30";
-      hash = "sha256-OBIskV2T6JQ/aKYnMW4Q+Ln9ZHdLhbQSEkqJZ/3Fho8=";
+      rev = "0be2b56dec91cf03d6b653dcbb24188dd5c44dd6";
+      hash = "sha256-KFXJR346h4ZR53EzhQRkThL7eFn0kb0z622jDHuHkEw=";
     };
     meta.homepage = "https://github.com/apple/tree-sitter-pkl";
   };
@@ -3027,12 +3027,12 @@
   slint = buildGrammar {
     passthru.name = "slint";
     language = "slint";
-    version = "0.0.0+rev=10fb0f188d7950400773c06ba6c31075866e14bf";
+    version = "0.0.0+rev=5dafe6745dd3bb24342acebe478015b642dc7135";
     src = fetchFromGitHub {
       owner = "slint-ui";
       repo = "tree-sitter-slint";
-      rev = "10fb0f188d7950400773c06ba6c31075866e14bf";
-      hash = "sha256-60DfIx7aQqe0/ocxbpr00eU3IPs23E8TUILcVGrBYVs=";
+      rev = "5dafe6745dd3bb24342acebe478015b642dc7135";
+      hash = "sha256-FS1a0N2yiRyBqhxxzUgR4mTnQ81Q8CfNZTb2AQrkBPw=";
     };
     meta.homepage = "https://github.com/slint-ui/tree-sitter-slint";
   };
@@ -3656,12 +3656,12 @@
   unison = buildGrammar {
     passthru.name = "unison";
     language = "unison";
-    version = "0.0.0+rev=c09e95252b4b3f5914c33d72a48af25089737afd";
+    version = "0.0.0+rev=873e599faaba40a69b8f9507f90bcfa0ae0bbe26";
     src = fetchFromGitHub {
       owner = "kylegoetz";
       repo = "tree-sitter-unison";
-      rev = "c09e95252b4b3f5914c33d72a48af25089737afd";
-      hash = "sha256-cntP5fMr5mU9lIYfHLKGrG/LUs54eY991gUD9djZevY=";
+      rev = "873e599faaba40a69b8f9507f90bcfa0ae0bbe26";
+      hash = "sha256-fnSuRrFp5AfuBKBXmzijBsYHvOHCUFjquuKbOrd1pBg=";
     };
     meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison";
     generate = true;
diff --git a/overlay.nix b/overlay.nix
index 2b4342b..7c92c46 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -109,7 +109,7 @@ in
           nvimSkipModules = [ "nvim-treesitter._meta.parsers" ];
         })
       );
-      nvim-treesitter = nvim-treesitter-unwrapped;
+      nvim-treesitter = lib.warn "The nvim-treesitter-main flake is deprecated; consider moving to the nvim-treesitter package provided by nixpkgs unstable." nvim-treesitter-unwrapped;
 
       nvim-treesitter-textobjects = prev'.nvim-treesitter-textobjects.overrideAttrs (old: {
         version = inputs.nvim-treesitter-textobjects.rev;