37 files changed, 5 insertions, 4 deletions

diff --git a/git-hooks/post-merge b/git-hooks/post-merge
deleted file mode 100755
index 96f22007..00000000
--- a/git-hooks/post-merge
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env zsh
-exec "$GIT_DIR/../install"
diff --git a/xresources/prefect b/host-prefect/Xresources
index b8cb7f0b..eb45787c 100644
--- a/xresources/prefect
+++ b/host-prefect/Xresources
@@ -1,4 +1,4 @@
-#include "main"
+#include ".xresources/main"
 
 Emacs.Font:                         -*-Droid Sans Mono-medium-*-*-*-*-120-*-*-*-*-*-*
 Emacs.fixed-pitch.attributeFont:    -*-Droid Sans Mono-medium-*-*-*-*-120-*-*-*-*-*-*
diff --git a/atoprc b/tag-atop/atoprc
index d03319ea..d03319ea 100644
--- a/atoprc
+++ b/tag-atop/atoprc
diff --git a/dwm/config.h b/tag-dwm/dwm/config.h
index ae1d8bb3..ae1d8bb3 100644
--- a/dwm/config.h
+++ b/tag-dwm/dwm/config.h
diff --git a/emacs/Cask b/tag-emacs/emacs.d/Cask
index 8742df0f..8742df0f 100644
--- a/emacs/Cask
+++ b/tag-emacs/emacs.d/Cask
diff --git a/emacs/elisp/ap-functions.el b/tag-emacs/emacs.d/elisp/ap-functions.el
index bdc7faef..bdc7faef 100644
--- a/emacs/elisp/ap-functions.el
+++ b/tag-emacs/emacs.d/elisp/ap-functions.el
diff --git a/emacs/elisp/php-electric.el b/tag-emacs/emacs.d/elisp/php-electric.el
index 599b2b1d..599b2b1d 100644
--- a/emacs/elisp/php-electric.el
+++ b/tag-emacs/emacs.d/elisp/php-electric.el
diff --git a/emacs/elisp/shuffle-lines.el b/tag-emacs/emacs.d/elisp/shuffle-lines.el
index be0a98f9..be0a98f9 100644
--- a/emacs/elisp/shuffle-lines.el
+++ b/tag-emacs/emacs.d/elisp/shuffle-lines.el
diff --git a/emacs/elisp/xrdb-mode.el b/tag-emacs/emacs.d/elisp/xrdb-mode.el
index 712f0cbf..712f0cbf 100644
--- a/emacs/elisp/xrdb-mode.el
+++ b/tag-emacs/emacs.d/elisp/xrdb-mode.el
diff --git a/emacs/init.el b/tag-emacs/emacs.d/init.el
index 76505ad5..76505ad5 100644
--- a/emacs/init.el
+++ b/tag-emacs/emacs.d/init.el
diff --git a/gitconfig b/tag-git/config/git/config
index 7c21d74f..fb728fff 100644
--- a/gitconfig
+++ b/tag-git/config/git/config
@@ -22,4 +22,4 @@
 [diff]
 	algorithm = patience
 [core]
-	excludesfile = ~/.gitignore
+	excludesfile = ~/.config/git/global.gitignore
diff --git a/gitignore b/tag-git/config/git/ignore
index 7e23dcab..7e23dcab 100644
--- a/gitignore
+++ b/tag-git/config/git/ignore
diff --git a/hgrc b/tag-hg/hgrc
index 2f16f27e..2f16f27e 100644
--- a/hgrc
+++ b/tag-hg/hgrc
diff --git a/minttyrc b/tag-minttyrc/minttyrc
index 2e7f2d86..2e7f2d86 100644
--- a/minttyrc
+++ b/tag-minttyrc/minttyrc
diff --git a/ssh/rc b/tag-ssh/ssh/rc
index 7b6da3a8..7b6da3a8 100644
--- a/ssh/rc
+++ b/tag-ssh/ssh/rc
diff --git a/tmux.conf b/tag-tmux/tmux.conf
index 697e1238..697e1238 100644
--- a/tmux.conf
+++ b/tag-tmux/tmux.conf
diff --git a/xbindkeysrc.scm b/tag-xbindkeys/xbindkeysrc.scm
index 7b00c38d..7b00c38d 100644
--- a/xbindkeysrc.scm
+++ b/tag-xbindkeys/xbindkeysrc.scm
diff --git a/xmobarrc b/tag-xmobar/xmobarrc
index 7dfcef22..7dfcef22 100644
--- a/xmobarrc
+++ b/tag-xmobar/xmobarrc
diff --git a/xresources/main b/tag-xresources/xresources/main
index 77c21ce3..77c21ce3 100644
--- a/xresources/main
+++ b/tag-xresources/xresources/main
diff --git a/xresources/solarized-light b/tag-xresources/xresources/solarized-light
index 3906b7b0..3906b7b0 100644
--- a/xresources/solarized-light
+++ b/tag-xresources/xresources/solarized-light
diff --git a/zsh/completion/_tmux_pane_words b/tag-zsh/config/zsh/completion/_tmux_pane_words
index 6ff9ce18..6ff9ce18 100644
--- a/zsh/completion/_tmux_pane_words
+++ b/tag-zsh/config/zsh/completion/_tmux_pane_words
diff --git a/zsh/fasd.zsh b/tag-zsh/config/zsh/fasd.zsh
index 64dbf7b0..64dbf7b0 100644
--- a/zsh/fasd.zsh
+++ b/tag-zsh/config/zsh/fasd.zsh
diff --git a/zsh/freebsd.zsh b/tag-zsh/config/zsh/freebsd.zsh
index 6ca0f8d6..6ca0f8d6 100755
--- a/zsh/freebsd.zsh
+++ b/tag-zsh/config/zsh/freebsd.zsh
diff --git a/zsh/functions/fasd/fasd b/tag-zsh/config/zsh/functions/fasd/fasd
index b1e64f41..b1e64f41 100755
--- a/zsh/functions/fasd/fasd
+++ b/tag-zsh/config/zsh/functions/fasd/fasd
diff --git a/zsh/functions/pure/prompt_pure_setup b/tag-zsh/config/zsh/functions/pure/prompt_pure_setup
index 5c635037..5c635037 100644
--- a/zsh/functions/pure/prompt_pure_setup
+++ b/tag-zsh/config/zsh/functions/pure/prompt_pure_setup
diff --git a/zsh/functions/runit/_sv b/tag-zsh/config/zsh/functions/runit/_sv
index bf98b3ea..bf98b3ea 100644
--- a/zsh/functions/runit/_sv
+++ b/tag-zsh/config/zsh/functions/runit/_sv
diff --git a/zsh/functions/runit/getservicedir b/tag-zsh/config/zsh/functions/runit/getservicedir
index 2e5d961c..2e5d961c 100644
--- a/zsh/functions/runit/getservicedir
+++ b/tag-zsh/config/zsh/functions/runit/getservicedir
diff --git a/zsh/functions/runit/linksv b/tag-zsh/config/zsh/functions/runit/linksv
index 7ee71094..7ee71094 100644
--- a/zsh/functions/runit/linksv
+++ b/tag-zsh/config/zsh/functions/runit/linksv
diff --git a/zsh/functions/runit/renamesv b/tag-zsh/config/zsh/functions/runit/renamesv
index dba1098d..dba1098d 100644
--- a/zsh/functions/runit/renamesv
+++ b/tag-zsh/config/zsh/functions/runit/renamesv
diff --git a/zsh/prefect.zsh b/tag-zsh/config/zsh/prefect.zsh
index 997ba391..997ba391 100644
--- a/zsh/prefect.zsh
+++ b/tag-zsh/config/zsh/prefect.zsh
diff --git a/zsh/server.zsh b/tag-zsh/config/zsh/server.zsh
index d9d74219..d9d74219 100644
--- a/zsh/server.zsh
+++ b/tag-zsh/config/zsh/server.zsh
diff --git a/zsh/login.zsh b/tag-zsh/config/zsh/zlogin
index e69de29b..e69de29b 100755
--- a/zsh/login.zsh
+++ b/tag-zsh/config/zsh/zlogin
diff --git a/zsh/logout.zsh b/tag-zsh/config/zsh/zlogout
index e69de29b..e69de29b 100755
--- a/zsh/logout.zsh
+++ b/tag-zsh/config/zsh/zlogout
diff --git a/zsh/environment.zsh b/tag-zsh/config/zsh/zshenv
index 11932e6e..11932e6e 100755
--- a/zsh/environment.zsh
+++ b/tag-zsh/config/zsh/zshenv
diff --git a/zsh/interactive.zsh b/tag-zsh/config/zsh/zshrc
index 365214c9..365214c9 100755
--- a/zsh/interactive.zsh
+++ b/tag-zsh/config/zsh/zshrc
diff --git a/zsh/fasdrc b/tag-zsh/fasdrc
index 22259d72..22259d72 100644
--- a/zsh/fasdrc
+++ b/tag-zsh/fasdrc
diff --git a/tag-zsh/zshenv b/tag-zsh/zshenv
new file mode 100644
index 00000000..48b93e17
--- /dev/null
+++ b/tag-zsh/zshenv
@@ -0,0 +1,3 @@
+ZDOTDIR="$HOME/.config/zsh"
+
+source "$ZDOTDIR"/.zshenv