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/sh/.profile b/sh/.profile
index b5f0b9e..1ed4883 100644
--- a/sh/.profile
+++ b/sh/.profile
@@ -36,3 +36,7 @@ fi
 export HISTSIZE=5000
 export HISTFILE="$HOME/.history/sh"
 export HISTFILESIZE=10000
+
+if [ -r "$HOME/.nix-profile/etc/profile.d/nix.sh" ]; then
+	. "$HOME/.nix-profile/etc/profile.d/nix.sh"
+fi
diff --git a/vim/.vim/bundle/commentary b/vim/.vim/bundle/commentary
index be79030..141d9d3 160000
--- a/vim/.vim/bundle/commentary
+++ b/vim/.vim/bundle/commentary
@@ -1 +1 @@
-Subproject commit be79030b3e8c0ee3c5f45b4333919e4830531e80
+Subproject commit 141d9d32a9fb58fe474fcc89cd7221eb2dd57b3a
diff --git a/vim/.vim/bundle/direnv b/vim/.vim/bundle/direnv
new file mode 160000
index 0000000..5e75084
--- /dev/null
+++ b/vim/.vim/bundle/direnv
@@ -0,0 +1 @@
+Subproject commit 5e75084465ad37dd0a4d4b1198b5ffa8978ae4e1
diff --git a/vim/.vim/bundle/eunuch b/vim/.vim/bundle/eunuch
index dcd29a0..e066a09 160000
--- a/vim/.vim/bundle/eunuch
+++ b/vim/.vim/bundle/eunuch
@@ -1 +1 @@
-Subproject commit dcd29a00eb708be211d856afd3fddfbff7bc6208
+Subproject commit e066a0999e442d9d96f24ad9d203b1bd030ef72e
diff --git a/vim/.vim/bundle/filetype-nix b/vim/.vim/bundle/filetype-nix
index b06cccd..a3eed01 160000
--- a/vim/.vim/bundle/filetype-nix
+++ b/vim/.vim/bundle/filetype-nix
@@ -1 +1 @@
-Subproject commit b06cccd8ff61149b13d3fc8b7e0d06caa55c9888
+Subproject commit a3eed01f4de995a51dfdd06287e44fcb231f6adf
diff --git a/vim/.vim/bundle/fugitive b/vim/.vim/bundle/fugitive
index 4f24757..f5a94cb 160000
--- a/vim/.vim/bundle/fugitive
+++ b/vim/.vim/bundle/fugitive
@@ -1 +1 @@
-Subproject commit 4f24757df2a57fc01900334114b1790fcb75ad54
+Subproject commit f5a94cbc811aee12ad99cc82ee8092406aa94faf
diff --git a/vim/.vim/bundle/pathogen b/vim/.vim/bundle/pathogen
index 020ab25..e9fb091 160000
--- a/vim/.vim/bundle/pathogen
+++ b/vim/.vim/bundle/pathogen
@@ -1 +1 @@
-Subproject commit 020ab25c38f62627c1dab6c7a851176c6ad309f9
+Subproject commit e9fb0914dba5bdfe2feaa364dda2e9495c5620a2
diff --git a/vim/.vim/bundle/sleuth b/vim/.vim/bundle/sleuth
index 2826bc1..7a104e3 160000
--- a/vim/.vim/bundle/sleuth
+++ b/vim/.vim/bundle/sleuth
@@ -1 +1 @@
-Subproject commit 2826bc17ef1820f68dfe6e43574a567e3c67a56d
+Subproject commit 7a104e34c10c6f3581c6e98da7834d765d0b067c
diff --git a/vim/.vim/bundle/slime b/vim/.vim/bundle/slime
index 7d03749..dc8ca22 160000
--- a/vim/.vim/bundle/slime
+++ b/vim/.vim/bundle/slime
@@ -1 +1 @@
-Subproject commit 7d0374935e7bd4a3a3c2c5d7ac7d70c2650b89ae
+Subproject commit dc8ca22cef3f87999d926e18e2e230145e013838
diff --git a/vim/.vim/bundle/snipmate b/vim/.vim/bundle/snipmate
index f1432b6..17ac70e 160000
--- a/vim/.vim/bundle/snipmate
+++ b/vim/.vim/bundle/snipmate
@@ -1 +1 @@
-Subproject commit f1432b6022c9815cd89b9197b06e3efdc3596b78
+Subproject commit 17ac70ef00982b7b4865e2ff0efc34a4a5b59cab
diff --git a/vim/.vim/bundle/snipmate-addon-mw-utils b/vim/.vim/bundle/snipmate-addon-mw-utils
index 0c5612f..295862b 160000
--- a/vim/.vim/bundle/snipmate-addon-mw-utils
+++ b/vim/.vim/bundle/snipmate-addon-mw-utils
@@ -1 +1 @@
-Subproject commit 0c5612fa31ee434ba055e21c76f456244b3b5109
+Subproject commit 295862ba6be47ec3b11b6c85c10d982ffd9bc0b2
diff --git a/vim/.vim/bundle/snipmate-tlib b/vim/.vim/bundle/snipmate-tlib
index c14442d..19c9845 160000
--- a/vim/.vim/bundle/snipmate-tlib
+++ b/vim/.vim/bundle/snipmate-tlib
@@ -1 +1 @@
-Subproject commit c14442db8c019c73e1c5717fde10e157950152b6
+Subproject commit 19c98450af64fd9d875e009e0868cb119db01755
diff --git a/vim/.vim/bundle/supertab b/vim/.vim/bundle/supertab
index cdaa5c2..40fe711 160000
--- a/vim/.vim/bundle/supertab
+++ b/vim/.vim/bundle/supertab
@@ -1 +1 @@
-Subproject commit cdaa5c27c5a7f8b08a43d0b2e65929512299e33a
+Subproject commit 40fe711e088e2ab346738233dd5adbb1be355172
diff --git a/vim/.vim/bundle/tagbar b/vim/.vim/bundle/tagbar
index 959f487..387bbad 160000
--- a/vim/.vim/bundle/tagbar
+++ b/vim/.vim/bundle/tagbar
@@ -1 +1 @@
-Subproject commit 959f48798136bfd4ce60075d3c86c580fcf5e5c5
+Subproject commit 387bbadda98e1376ff3871aa461b1f0abd4ece70
diff --git a/vim/.vim/bundle/vinegar b/vim/.vim/bundle/vinegar
index bd7f7b7..09ac84c 160000
--- a/vim/.vim/bundle/vinegar
+++ b/vim/.vim/bundle/vinegar
@@ -1 +1 @@
-Subproject commit bd7f7b7929260072864462c04dde3b9f4c5e0d23
+Subproject commit 09ac84c4d152a944caa341e913220087211c72ef
diff --git a/vim/.vimrc b/vim/.vimrc
index 6fcc850..511e6aa 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -32,6 +32,7 @@ set nocompatible
 
   " Colors and syntax highlighting "
     colorscheme peachpuff
+    set background=dark
     filetype plugin on
     syntax on