diff --git a/nix/shell.nix b/nix/shell.nix
index fcda3a5..4584b59 100644
--- a/nix/shell.nix
+++ b/nix/shell.nix
@@ -1,22 +1,26 @@
 {
   mkShell,
-  rust-analyzer,
+  rustc,
+  cargo,
   rustfmt,
   clippy,
-  cargo,
   taplo,
+  rust-analyzer-unwrapped,
   rustPlatform,
 }:
 mkShell {
   name = "rust";
+
   packages = [
-    rust-analyzer
-    rustfmt
-    clippy
+    rustc
     cargo
 
+    (rustfmt.override {asNightly = true;})
+    clippy
+    cargo
     taplo
+    rust-analyzer-unwrapped
   ];
 
-  RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
+  env.RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
 }