61 files changed, 62 insertions, 82 deletions

diff --git a/config/user-dirs.dirs b/.config/user-dirs.dirs
index a3c4c61..a3c4c61 100644
--- a/config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
diff --git a/shell/_eclimrc b/.eclimrc
index 7b78828..7b78828 100644
--- a/shell/_eclimrc
+++ b/.eclimrc
diff --git a/shell/_emacs.d/.gitignore b/.emacs.d/.gitignore
index 88f820a..88f820a 100644
--- a/shell/_emacs.d/.gitignore
+++ b/.emacs.d/.gitignore
diff --git a/shell/_emacs.d/custom-var.el b/.emacs.d/custom-var.el
index 431ff6e..431ff6e 100644
--- a/shell/_emacs.d/custom-var.el
+++ b/.emacs.d/custom-var.el
diff --git a/shell/_emacs.d/init.el b/.emacs.d/init.el
index 921eace..921eace 100644
--- a/shell/_emacs.d/init.el
+++ b/.emacs.d/init.el
diff --git a/shell/_emacs.d/org-fragments.el b/.emacs.d/org-fragments.el
index 0e145ad..0e145ad 100644
--- a/shell/_emacs.d/org-fragments.el
+++ b/.emacs.d/org-fragments.el
diff --git a/shell/_emacs.d/site-lisp/dconf-proxy.el b/.emacs.d/site-lisp/dconf-proxy.el
index 954852a..954852a 100644
--- a/shell/_emacs.d/site-lisp/dconf-proxy.el
+++ b/.emacs.d/site-lisp/dconf-proxy.el
diff --git a/shell/_emacs.d/site-lisp/site-lisp-autoloads.el b/.emacs.d/site-lisp/site-lisp-autoloads.el
index 2b1e039..2b1e039 100644
--- a/shell/_emacs.d/site-lisp/site-lisp-autoloads.el
+++ b/.emacs.d/site-lisp/site-lisp-autoloads.el
diff --git a/shell/_emacs.d/site-lisp/util.el b/.emacs.d/site-lisp/util.el
index b5bdc10..b5bdc10 100644
--- a/shell/_emacs.d/site-lisp/util.el
+++ b/.emacs.d/site-lisp/util.el
diff --git a/shell/_emacs.d/site-lisp/with-package.el b/.emacs.d/site-lisp/with-package.el
index 3dfc52d..3dfc52d 100644
--- a/shell/_emacs.d/site-lisp/with-package.el
+++ b/.emacs.d/site-lisp/with-package.el
diff --git a/shell/_emacs.d/tools/libs/jpeg62.dll b/.emacs.d/tools/libs/jpeg62.dll
index 21c03d5..21c03d5 100644
--- a/shell/_emacs.d/tools/libs/jpeg62.dll
+++ b/.emacs.d/tools/libs/jpeg62.dll
diff --git a/shell/_emacs.d/tools/libs/libXpm.dll b/.emacs.d/tools/libs/libXpm.dll
index 0dcb292..0dcb292 100644
--- a/shell/_emacs.d/tools/libs/libXpm.dll
+++ b/.emacs.d/tools/libs/libXpm.dll
diff --git a/shell/_emacs.d/tools/libs/libpng-config b/.emacs.d/tools/libs/libpng-config
index 3c39bc9..3c39bc9 100644
--- a/shell/_emacs.d/tools/libs/libpng-config
+++ b/.emacs.d/tools/libs/libpng-config
diff --git a/shell/_emacs.d/tools/libs/libpng12-config b/.emacs.d/tools/libs/libpng12-config
index 3c39bc9..3c39bc9 100644
--- a/shell/_emacs.d/tools/libs/libpng12-config
+++ b/.emacs.d/tools/libs/libpng12-config
diff --git a/shell/_emacs.d/tools/libs/libpng12.dll b/.emacs.d/tools/libs/libpng12.dll
index 25c0a7c..25c0a7c 100644
--- a/shell/_emacs.d/tools/libs/libpng12.dll
+++ b/.emacs.d/tools/libs/libpng12.dll
diff --git a/shell/_emacs.d/tools/libs/libpng14-14.dll b/.emacs.d/tools/libs/libpng14-14.dll
index 8b93b06..8b93b06 100644
--- a/shell/_emacs.d/tools/libs/libpng14-14.dll
+++ b/.emacs.d/tools/libs/libpng14-14.dll
diff --git a/shell/_emacs.d/tools/libs/libpng3.dll b/.emacs.d/tools/libs/libpng3.dll
index 649ec64..649ec64 100644
--- a/shell/_emacs.d/tools/libs/libpng3.dll
+++ b/.emacs.d/tools/libs/libpng3.dll
diff --git a/shell/_emacs.d/tools/libs/libtiff3.dll b/.emacs.d/tools/libs/libtiff3.dll
index 9883c51..9883c51 100644
--- a/shell/_emacs.d/tools/libs/libtiff3.dll
+++ b/.emacs.d/tools/libs/libtiff3.dll
diff --git a/shell/_emacs.d/tools/libs/libungif4.dll b/.emacs.d/tools/libs/libungif4.dll
index 2308352..2308352 100644
--- a/shell/_emacs.d/tools/libs/libungif4.dll
+++ b/.emacs.d/tools/libs/libungif4.dll
diff --git a/shell/_emacs.d/tools/libs/xpm4.dll b/.emacs.d/tools/libs/xpm4.dll
index 0414d84..0414d84 100644
--- a/shell/_emacs.d/tools/libs/xpm4.dll
+++ b/.emacs.d/tools/libs/xpm4.dll
diff --git a/shell/_emacs.d/tools/libs/zip.exe b/.emacs.d/tools/libs/zip.exe
index 65de183..65de183 100644
--- a/shell/_emacs.d/tools/libs/zip.exe
+++ b/.emacs.d/tools/libs/zip.exe
diff --git a/shell/_emacs.d/tools/libs/zlib1.dll b/.emacs.d/tools/libs/zlib1.dll
index 31996cd..31996cd 100644
--- a/shell/_emacs.d/tools/libs/zlib1.dll
+++ b/.emacs.d/tools/libs/zlib1.dll
diff --git a/shell/_emacs.d/tools/profiler/profile-dotemacs.el b/.emacs.d/tools/profiler/profile-dotemacs.el
index 160b800..160b800 100644
--- a/shell/_emacs.d/tools/profiler/profile-dotemacs.el
+++ b/.emacs.d/tools/profiler/profile-dotemacs.el
diff --git a/shell/_emacs.d/tools/profiler/run_profiler.el b/.emacs.d/tools/profiler/run_profiler.el
index 39939c2..39939c2 100644
--- a/shell/_emacs.d/tools/profiler/run_profiler.el
+++ b/.emacs.d/tools/profiler/run_profiler.el
diff --git a/shell/_gdbinit b/.gdbinit
index 9422460..9422460 100644
--- a/shell/_gdbinit
+++ b/.gdbinit
diff --git a/shell/_gitconfig b/.gitconfig
index 78ac758..78ac758 100644
--- a/shell/_gitconfig
+++ b/.gitconfig
diff --git a/.gitignore b/.gitignore
index dc3bd7d..079e568 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 *.pyc
-shell/_vim/.netrwhist
+.vim/.netrwhist
 .updated
diff --git a/.gitmodules b/.gitmodules
index 483fda4..83a2ad8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,45 +1,45 @@
 [submodule "shell/_oh-my-zsh"]
-	path = shell/_oh-my-zsh
+	path = .oh-my-zsh
 	url = https://github.com/robbyrussell/oh-my-zsh.git
 [submodule "shell/_vim/bundle/vim-pathogen"]
-	path = shell/_vim/bundle/vim-pathogen
+	path = .vim/bundle/vim-pathogen
 	url = https://github.com/tpope/vim-pathogen.git
 [submodule "shell/_vim/bundle/vim-misc"]
-	path = shell/_vim/bundle/vim-misc
+	path = .vim/bundle/vim-misc
 	url = https://github.com/xolox/vim-misc.git
 [submodule "shell/_vim/bundle/vim-airline"]
-	path = shell/_vim/bundle/vim-airline
+	path = .vim/bundle/vim-airline
 	url = https://github.com/bling/vim-airline.git
 [submodule "shell/_vim/bundle/syntastic"]
-	path = shell/_vim/bundle/syntastic
+	path = .vim/bundle/syntastic
 	url = https://github.com/scrooloose/syntastic.git
 [submodule "shell/_vim/bundle/nerdcommenter"]
-	path = shell/_vim/bundle/nerdcommenter
+	path = .vim/bundle/nerdcommenter
 	url = https://github.com/scrooloose/nerdcommenter.git
 [submodule "shell/_vim/bundle/vim-surround"]
-	path = shell/_vim/bundle/vim-surround
+	path = .vim/bundle/vim-surround
 	url = https://github.com/tpope/vim-surround.git
 [submodule "shell/_vim/bundle/jedi-vim"]
-	path = shell/_vim/bundle/jedi-vim
+	path = .vim/bundle/jedi-vim
 	url = https://github.com/davidhalter/jedi-vim.git
 [submodule "shell/_vim/bundle/rust.vim"]
-	path = shell/_vim/bundle/rust.vim
+	path = .vim/bundle/rust.vim
 	url = https://github.com/wting/rust.vim.git
 [submodule "shell/_vim/bundle/vim-ledger"]
-	path = shell/_vim/bundle/vim-ledger
+	path = .vim/bundle/vim-ledger
 	url = https://github.com/ledger/vim-ledger.git
 [submodule "shell/_vim/bundle/vim-easy-align"]
-	path = shell/_vim/bundle/vim-easy-align
+	path = .vim/bundle/vim-easy-align
 	url = https://github.com/junegunn/vim-easy-align.git
 [submodule "shell/_vim/bundle/vim-distinguished"]
-	path = shell/_vim/bundle/vim-distinguished
+	path = .vim/bundle/vim-distinguished
 	url = https://github.com/Lokaltog/vim-distinguished.git
 [submodule "shell/_vim/bundle/gundo.vim"]
-	path = shell/_vim/bundle/gundo.vim
+	path = .vim/bundle/gundo.vim
 	url = https://github.com/sjl/gundo.vim.git
 [submodule "shell/_vim/bundle/ctrlp.vim"]
-	path = shell/_vim/bundle/ctrlp.vim
+	path = .vim/bundle/ctrlp.vim
 	url = https://github.com/ctrlpvim/ctrlp.vim.git
 [submodule "shell/_vim/bundle/vim-sleuth"]
-	path = shell/_vim/bundle/vim-sleuth
+	path = .vim/bundle/vim-sleuth
 	url = https://github.com/tpope/vim-sleuth.git
diff --git a/shell/_gnupg/.gitignore b/.gnupg/.gitignore
index 80d294a..80d294a 100644
--- a/shell/_gnupg/.gitignore
+++ b/.gnupg/.gitignore
diff --git a/shell/_gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
index 85405bc..85405bc 100644
--- a/shell/_gnupg/gpg-agent.conf
+++ b/.gnupg/gpg-agent.conf
diff --git a/shell/_gnupg/gpg.conf b/.gnupg/gpg.conf
index 585e888..585e888 100644
--- a/shell/_gnupg/gpg.conf
+++ b/.gnupg/gpg.conf
diff --git a/shell/_makepkg.conf b/.makepkg.conf
index 2d44f5a..2d44f5a 100644
--- a/shell/_makepkg.conf
+++ b/.makepkg.conf
diff --git a/email/_msmtprc b/.msmtprc
index 3887133..3887133 100644
--- a/email/_msmtprc
+++ b/.msmtprc
diff --git a/email/_mutt/Equifax_Secure_CA.cert b/.mutt/Equifax_Secure_CA.cert
index c3e1112..c3e1112 100644
--- a/email/_mutt/Equifax_Secure_CA.cert
+++ b/.mutt/Equifax_Secure_CA.cert
diff --git a/email/_mutt/colors.muttrc b/.mutt/colors.muttrc
index 25c8dda..25c8dda 100644
--- a/email/_mutt/colors.muttrc
+++ b/.mutt/colors.muttrc
diff --git a/email/_mutt/gpg.muttrc b/.mutt/gpg.muttrc
index bb9a5a7..bb9a5a7 100644
--- a/email/_mutt/gpg.muttrc
+++ b/.mutt/gpg.muttrc
diff --git a/email/_mutt/muttrc b/.mutt/muttrc
index bd1c83a..bd1c83a 100644
--- a/email/_mutt/muttrc
+++ b/.mutt/muttrc
diff --git a/email/_mutt/offlineimap.py b/.mutt/offlineimap.py
index c358caa..c358caa 100644
--- a/email/_mutt/offlineimap.py
+++ b/.mutt/offlineimap.py
diff --git a/email/_mutt/sig b/.mutt/sig
index 255bdcb..255bdcb 100644
--- a/email/_mutt/sig
+++ b/.mutt/sig
diff --git a/email/_mutt/temp/.gitignore b/.mutt/temp/.gitignore
index 5e7d273..5e7d273 100644
--- a/email/_mutt/temp/.gitignore
+++ b/.mutt/temp/.gitignore
diff --git a/email/_offlineimaprc b/.offlineimaprc
index b74910b..b74910b 100644
--- a/email/_offlineimaprc
+++ b/.offlineimaprc
diff --git a/shell/_oh-my-zsh b/.oh-my-zsh
-Subproject 644bc641ad48c74c88631d79d48ec9b6f3f5a3e
+Subproject 644bc641ad48c74c88631d79d48ec9b6f3f5a3e
diff --git a/shell/_tmux.conf b/.tmux.conf
index 9ee9f96..9ee9f96 100644
--- a/shell/_tmux.conf
+++ b/.tmux.conf
diff --git a/shell/_vim/bundle/ctrlp.vim b/.vim/bundle/ctrlp.vim
-Subproject 7a80267ed061f3dc30bb319f438bdadfd8c7b1f
+Subproject 7a80267ed061f3dc30bb319f438bdadfd8c7b1f
diff --git a/shell/_vim/bundle/gundo.vim b/.vim/bundle/gundo.vim
-Subproject dd5ab1e930deb8c74ea9046654dd0587df0cf45
+Subproject dd5ab1e930deb8c74ea9046654dd0587df0cf45
diff --git a/shell/_vim/bundle/jedi-vim b/.vim/bundle/jedi-vim
-Subproject dc23f0b859d3b5c087921b68cf7cd66803ecca8
+Subproject dc23f0b859d3b5c087921b68cf7cd66803ecca8
diff --git a/shell/_vim/bundle/nerdcommenter b/.vim/bundle/nerdcommenter
-Subproject 1f4bfd59920c101a30a74a07b824608a6e65f3f
+Subproject 1f4bfd59920c101a30a74a07b824608a6e65f3f
diff --git a/shell/_vim/bundle/rust.vim b/.vim/bundle/rust.vim
-Subproject 2450ecf3091cc7c2711ca9f00eae8e3bedd0437
+Subproject 2450ecf3091cc7c2711ca9f00eae8e3bedd0437
diff --git a/shell/_vim/bundle/syntastic b/.vim/bundle/syntastic
-Subproject 06a8469556bca04d2276917b1043e25cfa6ec81
+Subproject 06a8469556bca04d2276917b1043e25cfa6ec81
diff --git a/shell/_vim/bundle/vim-airline b/.vim/bundle/vim-airline
-Subproject 14d14cf951c08fc88ca6c3e6f28fe47b99421e2
+Subproject 14d14cf951c08fc88ca6c3e6f28fe47b99421e2
diff --git a/shell/_vim/bundle/vim-distinguished b/.vim/bundle/vim-distinguished
-Subproject 62b360dc81355b53d124cd06218a9ba2496563f
+Subproject 62b360dc81355b53d124cd06218a9ba2496563f
diff --git a/shell/_vim/bundle/vim-easy-align b/.vim/bundle/vim-easy-align
-Subproject 7cb559eb70600bbd81afbb2d7f60d98334f631e
+Subproject 7cb559eb70600bbd81afbb2d7f60d98334f631e
diff --git a/shell/_vim/bundle/vim-ledger b/.vim/bundle/vim-ledger
-Subproject 0ebef8fcb5962602c6062ddbd07bada4df0af8b
+Subproject 0ebef8fcb5962602c6062ddbd07bada4df0af8b
diff --git a/shell/_vim/bundle/vim-misc b/.vim/bundle/vim-misc
-Subproject 3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0
+Subproject 3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0
diff --git a/shell/_vim/bundle/vim-pathogen b/.vim/bundle/vim-pathogen
-Subproject b4174e4d1a16e7f0c5c6dfca923269a20a9f50c
+Subproject b4174e4d1a16e7f0c5c6dfca923269a20a9f50c
diff --git a/shell/_vim/bundle/vim-sleuth b/.vim/bundle/vim-sleuth
-Subproject a17462708aa40a7fc0afd4effa559087d8a2c90
+Subproject a17462708aa40a7fc0afd4effa559087d8a2c90
diff --git a/shell/_vim/bundle/vim-surround b/.vim/bundle/vim-surround
-Subproject 2d05440ad23f97a7874ebd9b5de3a0e65d25d85
+Subproject 2d05440ad23f97a7874ebd9b5de3a0e65d25d85
diff --git a/shell/_vimrc b/.vimrc
index a73485a..a73485a 100644
--- a/shell/_vimrc
+++ b/.vimrc
diff --git a/shell/_zshrc b/.zshrc
index 6de5049..379fa0c 100644
--- a/shell/_zshrc
+++ b/.zshrc
@@ -43,7 +43,7 @@ COMPLETION_WAITING_DOTS="true"
 # HIST_STAMPS="mm/dd/yyyy"
 
 # Would you like to use another custom folder than $ZSH/custom?
-# ZSH_CUSTOM=/path/to/new-custom-folder
+ZSH_CUSTOM=~/dotfiles/zsh-custom
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
@@ -136,6 +136,7 @@ function update_dotfiles() {
 		cd "$dotfiles"
 		git pull --rebase --stat origin master
 		echo $epoch_curr > "$epoch_file"
+		./install.sh
 		cd -
 
 		echo "Finished."
diff --git a/install.sh b/install.sh
index 8f39a26..e4601b7 100755
--- a/install.sh
+++ b/install.sh
@@ -1,69 +1,48 @@
 #!/bin/sh -e
 
-dotfiles=$(pwd)
-
-# make sure all submodules are there
-git submodule update --init --recursive
-
-# [zsh]
-ln -sf "$dotfiles/shell/_zshrc" "$HOME/.zshrc"
-ln -sfT "$dotfiles/shell/_oh-my-zsh" "$HOME/.oh-my-zsh"
-ln -sfT "$dotfiles/shell/themes" "$HOME/.oh-my-zsh/custom/themes"
-
-# [vim]
-ln -sf "$dotfiles/shell/_vimrc" "$HOME/.vimrc"
-ln -sfT "$dotfiles/shell/_vim" "$HOME/.vim"
-
-# [git]
-ln -sf "$dotfiles/shell/_gitconfig" "$HOME/.gitconfig"
-
-# [tmux]
-ln -sf "$dotfiles/shell/_tmux.conf" "$HOME/.tmux.conf"
-
-# [gdb]
-ln -sf "$dotfiles/shell/_gdbinit" "$HOME/.gdbinit"
-
-# [gpg]
-ln -sfT "$dotfiles/shell/_gnupg" "$HOME/.gnupg"
-
-# [emacs]
-ln -sfT "$dotfiles/shell/_emacs.d" "$HOME/.emacs.d"
-
-# [user dirs]
-ln -sf "$dotfiles/config/user-dirs.dirs" "$HOME/.config/user-dirs.dirs"
-
-# [eclim]
-ln -sf "$dotfiles/shell/_eclimrc" "$HOME/.eclimrc"
-
-# create directories
-mkdir -p ~/bin
-mkdir -p ~/etc
-mkdir -p ~/share
-mkdir -p ~/media
-mkdir -p ~/media/games
-mkdir -p ~/media/music
-mkdir -p ~/media/pictures
-mkdir -p ~/media/videos
-mkdir -p ~/var
-mkdir -p ~/var/cache
-mkdir -p ~/var/downloads
-mkdir -p ~/var/log
-mkdir -p ~/var/run
-mkdir -p ~/var/tmp
-mkdir -p ~/var/vim
-mkdir -p ~/var/VMs
-
-if [ "$1" = "arch" ]; then
-	echo "Performing full installation."
-
-	# [arch linux]
-	ln -sf "$dotfiles/shell/_makepkg.conf" "$HOME/.makepkg.conf"
-
-	# [email]
-	ln -sfT "$dotfiles/email/_mutt" "$HOME/.mutt"
-	ln -sf "$dotfiles/email/_offlineimaprc" "$HOME/.offlineimaprc"
-	ln -sf "$dotfiles/email/_msmtprc" "$HOME/.msmtprc"
+if [ "$#" -ne 1 ]; then
+	# make sure all submodules are there
+	git submodule update --init --recursive
+
+	# create directories
+	mkdir -p ~/bin
+	mkdir -p ~/etc
+	mkdir -p ~/share
+	mkdir -p ~/media
+	mkdir -p ~/media/games
+	mkdir -p ~/media/music
+	mkdir -p ~/media/pictures
+	mkdir -p ~/media/videos
+	mkdir -p ~/var
+	mkdir -p ~/var/cache
+	mkdir -p ~/var/downloads
+	mkdir -p ~/var/log
+	mkdir -p ~/var/run
+	mkdir -p ~/var/tmp
+	mkdir -p ~/var/vim
+	mkdir -p ~/var/VMs
 	mkdir -p ~/.mail
-fi
 
-echo "Finished installing dotfiles"
+	find . -maxdepth 1 ! -path . ! -name .git ! -name .gitmodules \
+		! -name .gitignore ! -name .updated -name '.*' -exec "$0" {} \;
+
+	echo "Finished installing dotfiles"
+else
+	canonical=$(echo $1 | sed "s|^\./||")
+	target="$HOME/$canonical"
+	origin="$(pwd)/$canonical"
+
+	if [ ! -e "$target" ] || [ -L "$target" ]; then
+		# target either doesn't exist or is a symbolic link and can thus be
+		# safely replaced
+		ln -sfT "$origin" "$target"
+	elif [ -d "$target" ]; then
+		# target is not a symbolic link, but a directory, thus we link
+		# everything into that directory instead
+
+		find "$canonical" -maxdepth 1 -mindepth 1 ! -name .gitignore \
+			-exec "$0" {} \;
+	else
+		echo "Target file '$target' is not a symlink but exists, skipping"
+	fi
+fi
diff --git a/shell/themes/custom.zsh-theme b/zsh-custom/themes/custom.zsh-theme
index 31ff6c4..31ff6c4 100644
--- a/shell/themes/custom.zsh-theme
+++ b/zsh-custom/themes/custom.zsh-theme