diff --git a/nix/envrc b/nix/envrc
index fe397bdd79..0d450b32fe 100644
--- a/nix/envrc
+++ b/nix/envrc
@@ -1,2 +1,5 @@
-source_env nix/envrc-common
+watch_file nix/shell.nix
+watch_file nix/common.nix
+watch_file nix/sources.nix
+watch_file nix/sources.json
 use nix nix/shell.nix
diff --git a/nix/envrc-common b/nix/envrc-common
deleted file mode 100644
index 55aa08fc91..0000000000
--- a/nix/envrc-common
+++ /dev/null
@@ -1,4 +0,0 @@
-watch_file nix/shell.nix
-watch_file nix/common.nix
-watch_file nix/sources.nix
-watch_file nix/sources.json
diff --git a/nix/envrc-nvidia b/nix/envrc-nvidia
index a6f67b16d2..5fcdbc823b 100644
--- a/nix/envrc-nvidia
+++ b/nix/envrc-nvidia
@@ -1,2 +1,5 @@
-source_env nix/envrc-common
+watch_file nix/shell.nix
+watch_file nix/common.nix
+watch_file nix/sources.nix
+watch_file nix/sources.json
 use nix nix/shell.nix --arg nvidia true