diff --git a/.envrc b/.envrc
index f56cdb7b..0004fb0e 100644
--- a/.envrc
+++ b/.envrc
@@ -4,6 +4,4 @@ if has lorri; then
   eval "$(lorri direnv)"
 fi
 
-if [[ -f .envrc.local ]]; then
-    source_env .envrc.local
-fi
+source_env_if_exists .envrc.local
diff --git a/.gitignore b/.gitignore
index 70578e91..832de314 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ nixos/.deploy-gc
 nixos/result
 bundlewrap/.direnv
 .vscode
+.direnv
diff --git a/bundlewrap/.envrc b/bundlewrap/.envrc
index 3550a30f..af3b9a0d 100644
--- a/bundlewrap/.envrc
+++ b/bundlewrap/.envrc
@@ -1 +1,3 @@
 use flake
+
+source_env_if_exists .envrc.local