diff --git a/flake.nix b/flake.nix
index d010854..b6854ab 100644
--- a/flake.nix
+++ b/flake.nix
@@ -320,7 +320,16 @@
       // {
         glaurung = inputs.glaurung.defaultPackage."${system}";
         raclette = inputs.raclette.defaultPackage."${system}";
-        neovimTraxys = let
+        roaming_proxy = inputs.roaming_proxy.defaultPackage."${system}";
+        update-nvim-treesitter = callPackage ./neovim/nvim-treesitter {
+          inherit (self.packages."${system}") nvim-treesitter upstream;
+        };
+
+        inherit (nixpkgs-traxys.legacyPackages."${system}") groovy-language-server;
+        inherit (inputs.mujmap.packages."${system}") mujmap;
+      }
+      // (
+        let
           inputsMatching = with builtins;
             prefix:
               nixpkgs.lib.mapAttrs'
@@ -354,22 +363,29 @@
           };
 
           nixvim' = inputs.nixvim.legacyPackages."${system}";
+          neovimNightly = inputs.neovim-flake.packages."${system}".neovim;
         in
-          callPackage ({pkgs}:
-            nixvim'.makeNixvimWithModule {
-              module = import ./neovim;
-              pkgs = (pkgs.extend neovimPlugins).extend (final: prev: {
-                vimPlugins = prev.vimPlugins.extend (final': prev': {
-                  nvim-treesitter = prev'.nvim-treesitter.overrideAttrs (
-                    prev.callPackage ./neovim/nvim-treesitter/override.nix {} final' prev'
-                  );
-                });
+          callPackage ({pkgs}: let
+            neovimPkgs = (pkgs.extend neovimPlugins).extend (final: prev: {
+              vimPlugins = prev.vimPlugins.extend (final': prev': {
+                nvim-treesitter = prev'.nvim-treesitter.overrideAttrs (
+                  prev.callPackage ./neovim/nvim-treesitter/override.nix {} final' prev'
+                );
               });
-            }) {};
-        roaming_proxy = inputs.roaming_proxy.defaultPackage."${system}";
-        inherit (nixpkgs-traxys.legacyPackages."${system}") groovy-language-server;
-        inherit (inputs.mujmap.packages."${system}") mujmap;
-      };
+            });
+          in {
+            neovimTraxys = nixvim'.makeNixvimWithModule {
+              module = {
+                imports = [./neovim];
+                package = neovimNightly;
+              };
+              pkgs = neovimPkgs;
+            };
+            update-nvim-treesitter = neovimPkgs.callPackage ./neovim/nvim-treesitter {
+              upstream = neovimNightly;
+            };
+          }) {}
+      );
 
     extraInfo = import ./extra_info.nix;
   in {
diff --git a/neovim/nvim-treesitter/default.nix b/neovim/nvim-treesitter/default.nix
index da1f6d1..fcee147 100644
--- a/neovim/nvim-treesitter/default.nix
+++ b/neovim/nvim-treesitter/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   upstream,
-  nvim-treesitter,
+  vimPlugins,
   neovimUtils,
   nurl,
   python3,
@@ -14,7 +14,7 @@
       neovim-unwrapped = upstream;
     })
     .makeNeovimConfig {
-      plugins = [nvim-treesitter];
+      plugins = [vimPlugins.nvim-treesitter];
     };
 in
   stdenv.mkDerivation {
@@ -29,7 +29,7 @@ in
       mkdir -p $out/bin
       cat $src > $out/bin/update-nvim-treesitter
       chmod +x $out/bin/update-nvim-treesitter
-      wrapProgram $out/bin/update-nvim-treesitter --set NVIM_TREESITTER "${nvim-treesitter}" --prefix PATH : ${
+      wrapProgram $out/bin/update-nvim-treesitter --set NVIM_TREESITTER "${vimPlugins.nvim-treesitter}" --prefix PATH : ${
         lib.makeBinPath [
           (wrapNeovimUnstable upstream neovimTs)
           nurl