From d89c54aa2b6221a8473ff842b3b9abc81e6cc682 Mon Sep 17 00:00:00 2001
From: Nick Nisi <nick@nisi.org>
Date: Sat, 15 Mar 2014 08:03:12 -0500
Subject: [PATCH] further cleanup of zsh files

* renamed ZSH to DOTFILES
* create new ZSH variable that points to $DOTFILES/zsh
---
 zsh/config.zsh    | 4 ++--
 zsh/tmux.zsh      | 1 +
 zsh/zshrc.symlink | 9 +++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/zsh/config.zsh b/zsh/config.zsh
index d1f9ff2..9612bfe 100644
--- a/zsh/config.zsh
+++ b/zsh/config.zsh
@@ -30,5 +30,5 @@ bindkey '^[[3~' delete-char
 bindkey '^[^N' newtab
 bindkey '^?' backward-delete-char
 
-fpath=($ZSH/zsh/functions $fpath)
-autoload -U $ZSH/zsh/functions/*(:t)
+fpath=($ZSH/functions $fpath)
+autoload -U $ZSH/functions/*(:t)
diff --git a/zsh/tmux.zsh b/zsh/tmux.zsh
index 7dacea2..2f19642 100644
--- a/zsh/tmux.zsh
+++ b/zsh/tmux.zsh
@@ -1,3 +1,4 @@
+# tmux aliases
 alias ta='tmux attach'
 alias tls='tmux ls'
 alias tat='tmux attach -t'
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index 198db19..b634731 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -1,4 +1,5 @@
-export ZSH=$HOME/.dotfiles
+export DOTFILES=$HOME/.dotfiles
+export ZSH=$DOTFILES/zsh
 
 # define the code directory
 if [[ -d ~/code ]]; then
@@ -6,7 +7,7 @@ if [[ -d ~/code ]]; then
 fi
 
 # load all zsh config files
-for config ($ZSH/zsh/**/*.zsh) source $config
+for config ($ZSH/**/*.zsh) source $config
 
 if [[ -a ~/.localrc ]]; then
     source ~/.localrc
@@ -17,7 +18,7 @@ fi
 autoload -U compinit
 compinit
 
-for config ($ZSH/zsh/**/*completion.sh) source $config
+for config ($ZSH/**/*completion.sh) source $config
 
 export EDITOR='vim'
 
@@ -29,7 +30,7 @@ if [[ -d /usr/local/sbin ]]; then
 fi
 
 # adding path directory for custom scripts
-export PATH=$ZSH/bin:$PATH
+export PATH=$DOTFILES/bin:$PATH
 
 # check for custom bin directory and add to path
 if [[ -d ~/bin ]]; then