diff --git a/flake.lock b/flake.lock
index 1c7b1d475..03a329dd5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739866667,
-        "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
+        "lastModified": 1775710090,
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1740074384,
-        "narHash": "sha256-T2eO9ognlph94/TyAu1uILo38fZG1G4S5FQxG+YBDv0=",
+        "lastModified": 1775877051,
+        "narHash": "sha256-wpSQm2PD/w4uRo2wb8utk0b5hOBkkg/CZ1xICY+qB7M=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "d291a120b6524911249b198baf3ec3e07ff57e04",
+        "rev": "08b4f3633471874c8894632ade1b78d75dbda002",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 9506d09cd..269b0c091 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,17 +29,24 @@
   {
     devShells = forAllSystems ({ pkgs }: with pkgs; {
       default = mkShell rec {
-        buildInputs = [
-          rust-bin.stable.latest.default
-
+        nativeBuildInputs = [
           pkg-config
-          xorg.libxcb
+          rust-bin.stable.latest.default
+        ];
+
+        buildInputs = [
+          libx11
+          libxcb
           alsa-lib
           wayland
           libxkbcommon
           libGL
         ];
-        LD_LIBRARY_PATH = "${lib.makeLibraryPath buildInputs}";
+
+        LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs;
+
+        # Remove this if you don't need LSP support
+        RUST_SRC_PATH = "${rust-bin.stable.latest.rust-src}/lib/rustlib/src/rust/library";
       };
     });
   };
diff --git a/template-core/src/nixos/flake.nix b/template-core/src/nixos/flake.nix
index 9506d09cd..269b0c091 100644
--- a/template-core/src/nixos/flake.nix
+++ b/template-core/src/nixos/flake.nix
@@ -29,17 +29,24 @@
   {
     devShells = forAllSystems ({ pkgs }: with pkgs; {
       default = mkShell rec {
-        buildInputs = [
-          rust-bin.stable.latest.default
-
+        nativeBuildInputs = [
           pkg-config
-          xorg.libxcb
+          rust-bin.stable.latest.default
+        ];
+
+        buildInputs = [
+          libx11
+          libxcb
           alsa-lib
           wayland
           libxkbcommon
           libGL
         ];
-        LD_LIBRARY_PATH = "${lib.makeLibraryPath buildInputs}";
+
+        LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs;
+
+        # Remove this if you don't need LSP support
+        RUST_SRC_PATH = "${rust-bin.stable.latest.rust-src}/lib/rustlib/src/rust/library";
       };
     });
   };