This really fixes everything!

This commit is contained in:
Simon Gomizelj 2011-11-29 07:37:50 -05:00
commit 160761fbfe

View file

@ -5,23 +5,31 @@ local config_file plugin
# add a function path # add a function path
fpath=($ZSH/functions $ZSH/completions $fpath) fpath=($ZSH/functions $ZSH/completions $fpath)
for config_file ($ZSH/lib/*.zsh) source $config_file
plugin=${plugin:=()}
for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)
if [[ -d ~/.omz ]]; then if [[ -d ~/.omz ]]; then
[[ -d ~/.omz/functions ]] && fpath=(~/.omz/functions $fpath) [[ -d ~/.omz/functions ]] && fpath=(~/.omz/functions $fpath)
[[ -d ~/.omz/completion ]] && fpath=(~/.omz/completions $fpath) [[ -d ~/.omz/completion ]] && fpath=(~/.omz/completions $fpath)
fi
for config_file ($ZSH/lib/*.zsh) source $config_file
if [[ -d ~/.omz ]]; then
if [[ -d ~/.omz/lib ]]; then if [[ -d ~/.omz/lib ]]; then
for config_file (~/.omz/lib/*.zsh) source $config_file for config_file (~/.omz/lib/*.zsh) source $config_file
fi fi
fi
plugin=${plugin:=()}
for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)
if [[ -d ~/.omz ]]; then
if [[ -d ~/.omz/plugins ]]; then if [[ -d ~/.omz/plugins ]]; then
for plugin ($plugins) fpath=(~/.omz/plugins/$plugin $fpath) for plugin ($plugins) fpath=(~/.omz/plugins/$plugin $fpath)
fi fi
fi fi
# Load and run compinit
autoload -U compinit
compinit -i
# load plugins # load plugins
for plugin ($plugins); do for plugin ($plugins); do
if [[ -f ~/.omz/plugins/$plugin/$plugin.plugin.zsh ]]; then if [[ -f ~/.omz/plugins/$plugin/$plugin.plugin.zsh ]]; then
@ -31,10 +39,6 @@ for plugin ($plugins); do
fi fi
done done
# Load and run compinit
autoload -U compinit
compinit -i
# Load the theme # Load the theme
if [ "$ZSH_THEME" = "random" ] if [ "$ZSH_THEME" = "random" ]
then then