streamlined some more stuff, removed fzf for system installed version

.gitignore

@@ -1,2 +1,3 @@
 bin/zunit
 lib/local/_zunit
+lib/bookmarks

.gitmodules

@@ -7,9 +7,6 @@
 [submodule "lib/ohmyzsh"]
 	path = lib/ohmyzsh
 	url = https://github.com/robbyrussell/oh-my-zsh
-[submodule "lib/fzf"]
-	path = lib/fzf
-	url = https://github.com/junegunn/fzf.git
 [submodule "lib/gitignore"]
 	path = lib/gitignore
 	url = https://github.com/github/gitignore

README.md

@@ -6,5 +6,6 @@ This Repo contains my dotfiles
 Prerequisites:
 - xmlstarlet: ```yaourt -S xmlstarlet```
 - nano-syntax-highlighting ```yaourt -S nano-syntax-highleighting``` and then ```echo "include /usr/share/nano-syntax-highlighting/*.nanorc" >> /etc/nanorc``` as root
+- fzf nano-syntax-highlighting ```yaourt -S fzf```
 
 Install with the ```./install``` script.

config/dotbot/config

@@ -0,0 +1,6 @@
+- clean: ['~']
+
+- link:
+    ~/.gitconfig: config/git/config
+    ~/.zshrc: config/zsh/config
+    ~/.ssh/config: config/ssh/config

config/dotbot/dotbot.yaml

@@ -1,7 +0,0 @@
-- clean: ['~']
-
-- link:
-    ~/.fzf: lib/fzf
-    ~/.gitconfig: config/git/gitconfig
-    ~/.zshrc: config/zsh/zshrc
-    ~/.ssh/config: config/ssh/sshconfig

config/zsh/config

@@ -0,0 +1,20 @@
+export DOTFILES="${HOME}/dotfiles"
+export DOTLIB="${DOTFILES}/lib"
+export DOTBIN="${DOTFILES}/bin"
+export DOTCONF="${DOTFILES}/config"
+export DOTCONFD="${DOTCONF}/zsh/config.d"
+
+# Export Path
+export PATH="${DOTBIN}:/opt/android-sdk/build-tools/26.0.0:${PATH}"
+
+# Export Editor
+export EDITOR='nano'
+
+# Completions Paths
+fpath+=(${DOTLIB}/completions/src ${DOTLIB}/local)
+
+for file in ${DOTCONFD}/*.zsh; do source $file; done
+
+# Prompt
+autoload -U promptinit && promptinit
+prompt filthy

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

@@ -0,0 +1,3 @@
+export ZSH="${DOTLIB}/ohmyzsh"
+DISABLE_AUTO_UPDATE="true"
+source ${ZSH}/oh-my-zsh.sh

config/zsh/config.d/01-aliases.zsh

@@ -0,0 +1,7 @@
+alias rm='rm -i'
+alias cp='cp -i'
+alias mv='mv -i'
+alias la='ls -lAh'
+clearall () { clear; printf '\033[3J' }
+
+for file in ${DOTCONFD}/aliases/*.zsh; do source $file; done

config/zsh/config.d/02-functions.zsh

@@ -0,0 +1 @@
+for file in ${DOTCONFD}/functions/*.zsh; do source $file; done

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

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

config/zsh/config.d/aliases/os.zsh

@@ -0,0 +1,3 @@
+# Aliases for OS
+if type pacman &>/dev/null; then source ${DOTCONFD}/aliases/os/archlinux.zsh; fi
+if type apt-get &>/dev/null; then source ${DOTCONFD}/aliases/os/debian.zsh; fi

config/zsh/config.d/aliases/os/archlinux.zsh

@@ -15,7 +15,6 @@ if (( $+commands[yaourt] )); then
   alias yainsd='yaourt -S --asdeps'
   alias yamir='yaourt -Syy'
 
-
   if (( $+commands[abs] && $+commands[aur] )); then
     alias yaupd='yaourt -Sy && sudo abs && sudo aur'
   elif (( $+commands[abs] )); then
@@ -85,7 +84,6 @@ alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
 alias pacfileupg='sudo pacman -Fy'
 alias pacfiles='pacman tFs'
 
-
 if (( $+commands[abs] && $+commands[aur] )); then
   alias pacupd='sudo pacman -Sy && sudo abs && sudo aur'
 elif (( $+commands[abs] )); then
@@ -136,4 +134,3 @@ pacmansignkeys() {
       --no-permission-warning --command-fd 0 --edit-key $key
   done
 }
-

config/zsh/config.d/functions/cnf.zsh

@@ -0,0 +1,2 @@
+[[ -e /etc/zsh_command_not_found ]] && source /etc/zsh_command_not_found
+[[ -e /usr/share/doc/pkgfile/command-not-found.zsh ]] && source /usr/share/doc/pkgfile/command-not-found.zsh

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

@@ -0,0 +1 @@
+eval `dircolors ${DOTCONF}/dir/config`

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

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

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

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

config/zsh/config.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="/home/eeleater/dotfiles/config/tmux"
+	local zsh_tmux_plugin_path=${DOTCONF}/tmux
 
 	# Determine if the terminal supports 256 colors
 	if [[ `tput colors` == "256" ]]

config/zsh/config.d/functions/zshmarks.zsh

@@ -8,7 +8,7 @@
 # Set BOOKMARKS_FILE if it doesn't exist to the default.
 # Allows for a user-configured BOOKMARKS_FILE.
 if [[ -z $BOOKMARKS_FILE ]] ; then
-	export BOOKMARKS_FILE="$HOME/.bookmarks"
+	export BOOKMARKS_FILE=${DOTLIB}/bookmarks
 fi
 
 # Check if $BOOKMARKS_FILE is a symlink.

config/zsh/zshrc

@@ -1,20 +0,0 @@
-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
-
-# Export Path
-export PATH="${DOTF_BIN}:${DOTF_LIB}/welder/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
-
-# Prompt
-autoload -U promptinit && promptinit
-prompt filthy

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

@@ -1,7 +0,0 @@
-export ZSH="${DOTF_LIB}/ohmyzsh"
-
-# Settings
-#ZSH_THEME="mortalscumbag"
-DISABLE_AUTO_UPDATE="true"
-
-source ${ZSH}/oh-my-zsh.sh

config/zsh/zshrc.d/01-aliases.zsh

@@ -1,9 +0,0 @@
-alias rm='rm -i'
-alias cp='cp -i'
-alias mv='mv -i'
-alias la='ls -lAh'
-
-clearall () { clear; printf '\033[3J' }
-mkcd() { mkdir $1 &>/dev/null; [ -e $1 ] && cd $1 }
-
-for file in ${ZSHRCD}/aliases/*.zsh; do source $file; done

config/zsh/zshrc.d/02-functions.zsh

@@ -1 +0,0 @@
-for file in ${ZSHRCD}/functions/*.zsh; do source $file; done

config/zsh/zshrc.d/aliases/os.zsh

@@ -1,3 +0,0 @@
-# Aliases for OS
-if type pacman &>/dev/null; then source ${ZSHRCD}/aliases/os/archlinux.zsh; fi
-if type apt-get &>/dev/null; then source ${ZSHRCD}/aliases/os/debian.zsh; fi

config/zsh/zshrc.d/functions/cnf.zsh

@@ -1,33 +0,0 @@
-# Uses the command-not-found package zsh support
-# as seen in http://www.porcheron.info/command-not-found-for-zsh/
-# this is installed in Ubuntu
-
-[[ -e /etc/zsh_command_not_found ]] && source /etc/zsh_command_not_found
-
-# Arch Linux command-not-found support, you must have package pkgfile installed
-# https://wiki.archlinux.org/index.php/Pkgfile#.22Command_not_found.22_hook
-[[ -e /usr/share/doc/pkgfile/command-not-found.zsh ]] && source /usr/share/doc/pkgfile/command-not-found.zsh
-
-# Fedora command-not-found support
-if [ -f /usr/libexec/pk-command-not-found ]; then
-    command_not_found_handler () {
-        runcnf=1
-        retval=127
-        [ ! -S /var/run/dbus/system_bus_socket ] && runcnf=0
-        [ ! -x /usr/libexec/packagekitd ] && runcnf=0
-        if [ $runcnf -eq 1 ]
-            then
-            /usr/libexec/pk-command-not-found $@
-            retval=$?
-        fi
-        return $retval
-    }
-fi
-
-# OSX command-not-found support
-# https://github.com/Homebrew/homebrew-command-not-found
-if type brew &> /dev/null; then
-  if brew command command-not-found-init > /dev/null 2>&1; then
-    eval "$(brew command-not-found-init)";
-  fi
-fi

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

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

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

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

install

@@ -7,7 +7,7 @@ git submodule update --init --recursive
 
 
 echo "Installing Dotbot and Linking Files"
-${BASEDIR}/lib/dotbot/bin/dotbot -d ${BASEDIR} -c config/dotbot/dotbot.yaml ${@}
+${BASEDIR}/lib/dotbot/bin/dotbot -d ${BASEDIR} -c config/dotbot/config ${@}
 
 echo "Installing ZUnit"
 cd ${BASEDIR}/lib/zunit

lib/fzf

@@ -1 +0,0 @@
-Subproject commit bc3983181d992c564e069791b5c6549bde9bfeb3