diff --git a/.gitmodules b/.gitmodules
index d99d4c2..5a632d0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,3 +40,6 @@
 [submodule "vim/.vim/bundle/vinegar"]
 	path = vim/.vim/bundle/vinegar
 	url = https://github.com/tpope/vim-vinegar
+[submodule "vim/.vim/bundle/direnv"]
+	path = vim/.vim/bundle/direnv
+	url = https://github.com/direnv/direnv.vim.git
diff --git a/bash/.bashrc b/bash/.bashrc
index 3ab5658..fc77278 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -55,3 +55,7 @@ fi
 if [ -f "$HOME/.private_functions" ] && [ -r "$HOME/.private_functions" ]; then
   . "$HOME/.private_functions"
 fi
+
+if $(which direnv &> /dev/null); then
+  eval "$(direnv hook bash)"
+fi
diff --git a/vim/.vim/bundle/direnv b/vim/.vim/bundle/direnv
new file mode 160000
index 0000000..8b5d37e
--- /dev/null
+++ b/vim/.vim/bundle/direnv
@@ -0,0 +1 @@
+Subproject commit 8b5d37e9b334c855eb2669ca56b28423a40c3365