diff --git a/.envrc b/.envrc
new file mode 100644
index 000000000..b938e4e2f
--- /dev/null
+++ b/.envrc
@@ -0,0 +1,5 @@
+if ! has nix_direnv_version || ! nix_direnv_version 2.2.0; then
+  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.0/direnvrc" "sha256-5EwyKnkJNQeXrRkYbwwRBcXbibosCJqyIUuz9Xq+LRc="
+fi
+
+use flake .
diff --git a/.gitignore b/.gitignore
index b003befea..86d8a7d21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,41 +1,42 @@
 .DS_Store
 
 node_modules
 
 landing/node_modules
 landing/dist
 
 lib/node_modules
 
 web/node_modules
 web/dist
 
 keyserver/dist
 keyserver/node_modules
 keyserver/secrets
 keyserver/facts
 keyserver/*.env
 keyserver/*.env.*
 
 services/tunnelbroker/target
 services/tunnelbroker/src/libcpp/test/build
 
 .eslintcache
 .vscode
 !.vscode/extensions.json
 
 # CMake
 native/cpp/**/build
 services/*/build
 services/build
 services/lib/src/build
 shared/protos/build
 
 # Nix
 result*
 services/backup/blob_client/target/
+.direnv
 
 # Electron
 desktop/out/
 desktop/assets/
 desktop/dist/