X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/c90e467b755fd81ff45a42da78579e6677267b0e..fa17f6dc11ab3a15f051dee0172f296fd0f2cf9d:/zshrc

diff --git a/zshrc b/zshrc
index ceabb0c..e2dba1a 100644
--- a/zshrc
+++ b/zshrc
@@ -6,6 +6,27 @@ ZSH_CACHE=$XDG_CACHE_HOME/zsh
 [[ ! -d "$ZSH_CACHE" ]] && echo "Missing cache dir: '$ZSH_CACHE'" && return
 [[ ! -d "$ZSH_DATA" ]]  && echo "Missing data dir: '$ZSH_DATA'"   && return
 
+# populate path (order matters)
+typeset -U path     # make path a unique array
+# osx gnu utils (installed via brew)
+if (( $+commands[brew] )); then
+    for pkg in coreutils findutils gnu-sed make; do
+        [[ -d $(brew --prefix $pkg)/libexec/gnubin ]] && path=($(brew --prefix $pkg)/libexec/gnubin $path)
+    done
+fi
+# osx pip 3.7 install
+[[ -d ~/Library/Python/3.7/bin ]] && path=(~/Library/Python/3.7/bin $path)
+# personal scripts
+[[ -d ~/.local/bin ]] && path=(~/.local/bin $path)
+[[ -d ~/bin ]] && path=(~/bin $path)
+# android
+[[ -d /opt/android-sdk ]] && path=($path /opt/android-sdk/platform-tools)
+
+# load my functions
+typeset -U fpath    # make fpath a unique array
+[[ -d $ZSH/functions ]] && fpath=($ZSH/functions $fpath)
+autoload -U ${fpath[1]}/*(:t)   # loads all functions in the first element of fpath
+
 # Load all of the config files in $ZSH/lib that end in .zsh
 for config_file ($ZSH/lib/*.zsh); do
   source $config_file
@@ -16,11 +37,6 @@ done
 ZSH_THEME="ramsi"
 [[ -f "$ZSH/themes/${ZSH_THEME}.zsh-theme" ]] && source "$ZSH/themes/${ZSH_THEME}.zsh-theme"
 
-# load my functions
-typeset -U fpath    # make fpath a unique array
-[[ -d $ZSH/functions ]] && fpath=($ZSH/functions $fpath)
-autoload -U ${fpath[1]}/*(:t)   # loads all functions in the first element of fpath
-
 # initialise completion
 autoload -U compinit; compinit -d "$ZSH_CACHE/zcompdump"
 
@@ -38,15 +54,6 @@ setopt rematch_pcre # use perl regexp
 setopt noflowcontrol
 stty -ixon
 
-# populate path
-typeset -U path     # make path a unique array
-[[ -d ~/.local/bin ]] && path=(~/.local/bin $path)
-[[ -d ~/bin ]] && path=(~/bin $path)
-[[ -d /opt/android-sdk ]] && path=($path /opt/android-sdk/platform-tools)
-# osx gnu utils (installed via brew)
-[[ -d /usr/local/opt/coreutils/libexec/gnubin ]] && path=(/usr/local/opt/coreutils/libexec/gnubin $path)
-[[ -d /usr/local/opt/findutils/libexec/gnubin ]] && path=(/usr/local/opt/findutils/libexec/gnubin $path)
-
 # source aliases
 [[ -f $XDG_CONFIG_HOME/aliases ]] && source $XDG_CONFIG_HOME/aliases
 for alias_file ($ZSH/aliases/*.zsh); do
@@ -55,9 +62,8 @@ done
 
 # set up a few named directories
 hash -d fook=/mnt/fook
-hash -d ccr=~/ccr
 hash -d src=~/src
-hash -d chroot_testing=/buildsystem/testing/buildroot
-hash -d chroot_master=/buildsystem/master/buildroot
-hash -d chroot_lib32=/buildsystem/lib32/buildroot
-hash -d wineprefixes=/mnt/data/wineprefixes
+
+# fpp named dirs
+hash -d evk=~/src/fpp/evk
+hash -d fpp=~/src/fpp