Merge branch 'master' of git.nixy.moe:nixy/dotfiles

.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

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

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

vim/.vimrc

@@ -32,6 +32,7 @@ set nocompatible
 
   " Colors and syntax highlighting "
     colorscheme peachpuff
+    set background=dark
     filetype plugin on
     syntax on