diff --git a/tvix/eval/.envrc b/tvix/.envrc
similarity index 100%
rename from tvix/eval/.envrc
rename to tvix/.envrc
diff --git a/tvix/nix_cli/shell.nix b/tvix/nix_cli/shell.nix
deleted file mode 100644
index f57019cd9..000000000
--- a/tvix/nix_cli/shell.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-let
-  depot = (import ./.. { });
-  pkgs = depot.third_party.nixpkgs;
-
-in
-pkgs.mkShell {
-  buildInputs = [
-    pkgs.rustup
-    pkgs.rust-analyzer
-  ];
-}
diff --git a/tvix/eval/shell.nix b/tvix/shell.nix
similarity index 85%
rename from tvix/eval/shell.nix
rename to tvix/shell.nix
index 482ccb591..2da5b5f24 100644
--- a/tvix/eval/shell.nix
+++ b/tvix/shell.nix
@@ -1,5 +1,6 @@
-{ depot ? import ../../. { }
+{ depot ? import ../. { }
 , pkgs ? depot.third_party.nixpkgs
+, ...
 }:
 
 pkgs.mkShell {