From cb62f96109f20d1e059f9f37b35778341cd5f076 Mon Sep 17 00:00:00 2001
From: Nikolas Weger <nikolasweger@googlemail.com>
Date: Fri, 21 Jul 2017 12:55:49 +0200
Subject: [PATCH] even more changes

---
 config/ssh/sshconfig                       |  4 ----
 config/zsh/zshrc                           | 27 ++++++++++++----------
 config/zsh/zshrc.d/00-ohmy.zsh             |  2 +-
 config/zsh/zshrc.d/03-highlighting.zsh     |  2 +-
 config/zsh/zshrc.d/exports/dotfiles.zsh    |  5 ++++
 config/zsh/zshrc.d/exports/other.zsh       |  2 ++
 config/zsh/zshrc.d/functions/dircolors.zsh |  2 +-
 config/zsh/zshrc.d/functions/fzf.zsh       |  2 ++
 config/zsh/zshrc.d/functions/gitignore.zsh |  2 +-
 config/zsh/zshrc.d/functions/tmux.zsh      |  2 +-
 10 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 config/zsh/zshrc.d/exports/dotfiles.zsh
 create mode 100644 config/zsh/zshrc.d/exports/other.zsh
 create mode 100644 config/zsh/zshrc.d/functions/fzf.zsh

diff --git a/config/ssh/sshconfig b/config/ssh/sshconfig
index 651bcf1..01bd44b 100644
--- a/config/ssh/sshconfig
+++ b/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
diff --git a/config/zsh/zshrc b/config/zsh/zshrc
index d0498a4..23de4ab 100644
--- a/config/zsh/zshrc
+++ b/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
diff --git a/config/zsh/zshrc.d/00-ohmy.zsh b/config/zsh/zshrc.d/00-ohmy.zsh
index 9db0b32..b73edfe 100644
--- a/config/zsh/zshrc.d/00-ohmy.zsh
+++ b/config/zsh/zshrc.d/00-ohmy.zsh
@@ -1,4 +1,4 @@
-export ZSH="${LIB}/ohmyzsh"
+export ZSH="${DOTF_LIB}/ohmyzsh"
 
 # Settings
 ZSH_THEME="mortalscumbag"
diff --git a/config/zsh/zshrc.d/03-highlighting.zsh b/config/zsh/zshrc.d/03-highlighting.zsh
index 68cfc94..2617e16 100644
--- a/config/zsh/zshrc.d/03-highlighting.zsh
+++ b/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"
 
diff --git a/config/zsh/zshrc.d/exports/dotfiles.zsh b/config/zsh/zshrc.d/exports/dotfiles.zsh
new file mode 100644
index 0000000..ac5d0df
--- /dev/null
+++ b/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"
diff --git a/config/zsh/zshrc.d/exports/other.zsh b/config/zsh/zshrc.d/exports/other.zsh
new file mode 100644
index 0000000..da1bc69
--- /dev/null
+++ b/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'
diff --git a/config/zsh/zshrc.d/functions/dircolors.zsh b/config/zsh/zshrc.d/functions/dircolors.zsh
index 982e1e6..36c4092 100644
--- a/config/zsh/zshrc.d/functions/dircolors.zsh
+++ b/config/zsh/zshrc.d/functions/dircolors.zsh
@@ -1 +1 @@
-eval `dircolors ${CONFIG}/dir/dircolors`
+eval `dircolors ${DOTF_CONF}/dir/dircolors`
diff --git a/config/zsh/zshrc.d/functions/fzf.zsh b/config/zsh/zshrc.d/functions/fzf.zsh
new file mode 100644
index 0000000..1da22f1
--- /dev/null
+++ b/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"
diff --git a/config/zsh/zshrc.d/functions/gitignore.zsh b/config/zsh/zshrc.d/functions/gitignore.zsh
index ac979d9..05bf312 100644
--- a/config/zsh/zshrc.d/functions/gitignore.zsh
+++ b/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
diff --git a/config/zsh/zshrc.d/functions/tmux.zsh b/config/zsh/zshrc.d/functions/tmux.zsh
index 552c655..82b89e3 100644
--- a/config/zsh/zshrc.d/functions/tmux.zsh
+++ b/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" ]]