even more changes

config/ssh/sshconfig

@@ -5,7 +5,3 @@ Host web
 Host git
     HostName git.eeleater.org
     User eeleater
-
-Host test
-    HostName test.eeleater.org
-    User eeleater

config/zsh/zshrc

@@ -1,13 +1,16 @@
-# Export with respect to dotfiles folder
-export DOTFILES="${HOME}/dotfiles"
-export LIB="${DOTFILES}/lib"
-export CONFIG="${DOTFILES}/config"
-export ZSHRCD="${CONFIG}/zsh/zshrc.d"
-export SEPARATE="${ZSHRCD}/separate"
-export PATH="${HOME}/dotfiles/bin:/opt/android-sdk/build-tools/26.0.0/:${PATH}"
-export EDITOR='nano'
-fpath+=(${LIB}/completions/src ${LIB}/local)
+export DOTFILES="${HOME}/dotfiles"       # Main Dotfile Folder
+export DOTF_LIB="${DOTFILES}/lib"        # Libraries Folder
+export DOTF_BIN="${DOTFILES}/bin"        # Binaries Folder
+export DOTF_CONF="${DOTFILES}/config"    # Config Folder
+export ZSHRCD="${DOTF_CONF}/zsh/zshrc.d" # ZSHRC.D Folder
 
-# Source the needed parts
-for file in ${ZSHRCD}/*.zsh; do source $file; done # Other Files
-source ${HOME}/.fzf.zsh                            # FZF
+# Export Path
+export PATH="${HOME}/dotfiles/bin:/opt/android-sdk/build-tools/26.0.0/:${HOME}/.fzf/bin:${PATH}"
+
+# Export Editor
+export EDITOR='nano'
+
+# Completions Paths
+fpath+=(${DOTF_LIB}/completions/src ${DOTF_LIB}/local)
+
+for file in ${ZSHRCD}/*.zsh; do source $file; done

config/zsh/zshrc.d/00-ohmy.zsh

@@ -1,4 +1,4 @@
-export ZSH="${LIB}/ohmyzsh"
+export ZSH="${DOTF_LIB}/ohmyzsh"
 
 # Settings
 ZSH_THEME="mortalscumbag"

config/zsh/zshrc.d/03-highlighting.zsh

@@ -268,7 +268,7 @@ ZSH_HIGHLIGHT_MAXLENGTH=10000
 zmodload zsh/parameter 2>/dev/null
 
 autoload -U is-at-least
-source "${LIB}/highlight"
+source "${DOTF_LIB}/highlight"
 
 [[ "${+termcap[Co]}" = 1 && "${termcap[Co]}" = "256" ]] && FAST_HIGHLIGHT_STYLES[variable]="fg=112"
 

config/zsh/zshrc.d/exports/dotfiles.zsh

@@ -0,0 +1,5 @@
+export DOTFILES="${HOME}/dotfiles"
+export DOTF_LIB="${DOTFILES}/lib"
+export DOTF_CONF="${DOTFILES}/config"
+export DOTF_BIN="${DOTFILES}/bin"
+export ZSHRCD="${DOTF_CON}/zsh/zshrc.d"

config/zsh/zshrc.d/exports/other.zsh

@@ -0,0 +1,2 @@
+export PATH="${HOME}/dotfiles/bin:/opt/android-sdk/build-tools/26.0.0/:${HOME}/.fzf/bin:${PATH}"
+export EDITOR='nano'

config/zsh/zshrc.d/functions/dircolors.zsh

@@ -1 +1 @@
-eval `dircolors ${CONFIG}/dir/dircolors`
+eval `dircolors ${DOTF_CONF}/dir/dircolors`

config/zsh/zshrc.d/functions/fzf.zsh

@@ -0,0 +1,2 @@
+[[ $- == *i* ]] && source "/home/eeleater/.fzf/shell/completion.zsh" 2> /dev/null
+source "/home/eeleater/.fzf/shell/key-bindings.zsh"

config/zsh/zshrc.d/functions/gitignore.zsh

@@ -1,5 +1,5 @@
 export ZSH_PLUGIN_GITIGNORE_PATH=$(dirname $0)
-export ZSH_PLUGIN_GITIGNORE_TEMPLATE_PATHS=${LIB}/gitignore
+export ZSH_PLUGIN_GITIGNORE_TEMPLATE_PATHS=${DOTF_LIB}/gitignore
 
 function gie () {
     ${EDITOR} .gitignore

config/zsh/zshrc.d/functions/tmux.zsh

@@ -38,7 +38,7 @@ if which tmux &> /dev/null
 
 
 	# Get the absolute path to the current directory
-	local zsh_tmux_plugin_path="$(cd "$(dirname "$0")" && pwd)"
+	local zsh_tmux_plugin_path="/home/eeleater/dotfiles/config/tmux"
 
 	# Determine if the terminal supports 256 colors
 	if [[ `tput colors` == "256" ]]