From: Christoph Egger Date: Sat, 18 Feb 2017 16:07:31 +0000 (+0100) Subject: Fix fpath to load custom directories X-Git-Url: https://git.siccegge.de//index.cgi?p=dotfiles%2Fzsh.git;a=commitdiff_plain;h=63af345a3f1d5cb94eefa75bf6d372eed6c858ff Fix fpath to load custom directories --- diff --git a/zshrc b/zshrc index 7936b57..a1913d0 100644 --- a/zshrc +++ b/zshrc @@ -35,11 +35,11 @@ colors zmodload -i zsh/complist _force_rehash() { - if (( CURRENT == 1 )); then - rehash - fi - # We didn't really complete anything. - return 1 + if (( CURRENT == 1 )); then + rehash + fi + # We didn't really complete anything. + return 1 } zstyle :compinstall filename '/home/christoph/.zshrc' @@ -51,7 +51,7 @@ zstyle -e ':completion:*:approximate:*' max-errors 'reply=( $(( ($#PREFIX + $#SU zstyle ':completion:*:(^approximate):*' matcher-list 'm:{a-z}={A-Z}' bindkey -e -bindkey 'e' backward-word +bindkey 'e' backward-word bindkey 'f' forward-word bindkey '' down-line-or-search bindkey '' up-line-or-search @@ -60,18 +60,18 @@ bindkey '[28~' run-help setWindowTitle(){ - echo -e '\033]0;'$1'\007' + echo -e '\033]0;'$1'\007' } precmd () { - vcs_info - setWindowTitle ${USER}@${HOST} - - if [[ $UID == 0 && $+commands[systemctl] != 0 ]] - then - use_systemd=true - systemd_failed="`systemctl --state=failed | grep failed | cut -d \ -f 2 | tr '\n' ' '`" - fi + vcs_info + setWindowTitle ${USER}@${HOST} + + if [[ $UID == 0 && $+commands[systemctl] != 0 ]] + then + use_systemd=true + systemd_failed="`systemctl --state=failed | grep failed | cut -d \ -f 2 | tr '\n' ' '`" + fi } config=("default" "`uname -s`") @@ -82,11 +82,11 @@ case "${DOMAIN//cs.fau.de/informatik.uni-erlangen.de}" in config=($config debian) ;; (faui49*.uni-erlangen.de) - export EMAIL=Christoph.Egger@cs.fau.de + export EMAIL=Christoph.Egger@cs.fau.de config=($config i4lab) ;; (faui0*.informatik.uni-erlangen.de|faui48*.informatik.uni-erlangen.de) - export EMAIL=siccegge@cs.fau.de + export EMAIL=siccegge@cs.fau.de config=($config cip) ;; (*.siccegge.de) @@ -122,7 +122,13 @@ do done done - +for location in $config +do + if [ -d ~/.zsh/functions/${location}/ ] + then + fpath=( ~/.zsh/functions/${location}/ $fpath ) + fi +done karma () { gpg --fingerprint $1 >> ${HOME}/karma @@ -130,18 +136,16 @@ karma () { } gpgrefresh () { - gpg --refresh-keys 2>&1 | grep -v 'nicht geändert' + gpg --refresh-keys 2>&1 | grep -v 'nicht geändert' } sponsor() { - pkgname=`echo $i | rcut -d '/' -f 1 | cut -d '_' -f 1` - apt-get --download-only -t unstable $pkgname - dget $i + pkgname=`echo $i | rcut -d '/' -f 1 | cut -d '_' -f 1` + apt-get --download-only -t unstable $pkgname + dget $i } path=(${HOME}/bin $path) -fpath=(${HOME}/.zsh/functions/$CONFIG ${HOME}/.zsh/functions/default $fpath) - export PATH export FPATH