diff --git a/flake.lock b/flake.lock
index cf9e5a9..ce8b343 100644
--- a/flake.lock
+++ b/flake.lock
@@ -946,21 +946,6 @@
         "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
       }
     },
-    "nixpkgs-master": {
-      "locked": {
-        "lastModified": 1735430145,
-        "narHash": "sha256-+8O2vjWnfqNLDmHSwWQvce5KlRSo1wWee1523Aq3JRc=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "0d7cc712dea63b116baa1869ba7fe6f91f2c3905",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1735141468,
@@ -977,18 +962,18 @@
         "type": "github"
       }
     },
-    "nixpkgs-traxys": {
+    "nixpkgs-staging": {
       "locked": {
-        "lastModified": 1692884435,
-        "narHash": "sha256-ykp+yuy2FpK4oMlbCCeLBVAKa4pjqu24yUox7kgMpXY=",
-        "owner": "traxys",
+        "lastModified": 1735513553,
+        "narHash": "sha256-gy0yBLs9Y6fNe7E5Rh+mFdU29XqjfyIaaHsZFlsOudQ=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c335eeb76ffdeb38fe295b86f0bbf71a4e558a4a",
+        "rev": "84758abe5ac20edd899ad048e586d18ea1e8c911",
         "type": "github"
       },
       "original": {
-        "owner": "traxys",
-        "ref": "inflight",
+        "owner": "nixos",
+        "ref": "staging",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -1340,8 +1325,7 @@
         "nix-ld": "nix-ld",
         "nixos-cosmic": "nixos-cosmic",
         "nixpkgs": "nixpkgs_11",
-        "nixpkgs-master": "nixpkgs-master",
-        "nixpkgs-traxys": "nixpkgs-traxys",
+        "nixpkgs-staging": "nixpkgs-staging",
         "nixvim": "nixvim",
         "nur": "nur",
         "raclette": "raclette",
diff --git a/flake.nix b/flake.nix
index c9d6be3..8b46247 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,8 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-master.url = "github:nixos/nixpkgs";
-    nixpkgs-traxys.url = "github:traxys/nixpkgs/inflight";
+    nixpkgs-staging.url = "github:nixos/nixpkgs/staging";
     nix-gaming = {
       url = "github:fufexan/nix-gaming";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/neovim/pkg.nix b/neovim/pkg.nix
index bece25e..96c8f51 100644
--- a/neovim/pkg.nix
+++ b/neovim/pkg.nix
@@ -20,6 +20,7 @@
           pkgs = pkgs.extend (
             final: prev:
             {
+              inherit (inputs'.nixpkgs-staging.legacyPackages) tree-sitter;
               vimPlugins = prev.vimPlugins.extend (
                 final': prev': {
                   vim-headerguard = prev.vimUtils.buildVimPlugin {