@@ -8,9 +8,6 @@ setopt always_to_end

 WORDCHARS=''

-autoload -U compinit

-compinit -i

-

 zmodload -i zsh/complist

 ## case-insensitive (all),partial-word and then substring completion

@@ -1,6 +1,4 @@

 # TODO: Explain what some of this does..

-autoload -U compinit

-compinit -i

 bindkey -e

 bindkey '\ew' kill-region

@@ -7,12 +7,23 @@ fpath=($ZSH/functions $fpath)

 # TIP: Add files you don't want in git to .gitignore

 for config_file ($ZSH/lib/*.zsh) source $config_file

-# Load all of your custom configurations from custom/

-for config_file ($ZSH/custom/*.zsh) source $config_file

+# Add all defined plugins to fpath

+plugin=${plugin:=()}

+for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)

+

+# Load and run compinit

+autoload -U compinit

+compinit -i

 # Load all of the plugins that were defined in ~/.zshrc

-plugin=${plugin:=()}

-for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh

+for plugin ($plugins); do

+  if [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then

+    source $ZSH/plugins/$plugin/$plugin.plugin.zsh

+  fi

+done

+

+# Load all of your custom configurations from custom/

+for config_file ($ZSH/custom/*.zsh) source $config_file

 # Load the theme

 source "$ZSH/themes/$ZSH_THEME.zsh-theme"

deleted file mode 100644

@@ -1,4 +0,0 @@

-# add brew completion function to path

-fpath=($ZSH/plugins/brew $fpath)

-autoload -U compinit

-compinit -i

deleted file mode 100644

@@ -1,4 +0,0 @@

-# add cpanm completion function to path

-fpath=($ZSH/plugins/cpanm $fpath)

-autoload -U compinit

-compinit -i

deleted file mode 100644

@@ -1,4 +0,0 @@

-# add gem completion function to path

-fpath=($ZSH/plugins/gem $fpath)

-autoload -U compinit

-compinit -i

@@ -5,7 +5,3 @@ if [ "$commands[(I)hub]" ]; then

     function git(){hub "$@"}

 fi

-# add github completion function to path

-fpath=($ZSH/plugins/github $fpath)

-autoload -U compinit

-compinit -i

@@ -6,7 +6,3 @@ alias puni="sudo port uninstall inactive"

 alias puo="sudo port upgrade outdated"

 alias pup="psu && puo"

-# add macports completion function to path

-fpath=($ZSH/plugins/macports $fpath)

-autoload -U compinit

-compinit -i

deleted file mode 100644

@@ -1,4 +0,0 @@

-# add npm completion function to path

-fpath=($ZSH/plugins/npm $fpath)

-autoload -U compinit

-compinit -i

deleted file mode 100644

@@ -1,4 +0,0 @@

-# add brew completion function to path

-fpath=($ZSH/plugins/pip $fpath)

-autoload -U compinit

-compinit -i

deleted file mode 100644

@@ -1,4 +0,0 @@

-# add redis completion function to path

-fpath=($ZSH/plugins/redis-cli $fpath)

-autoload -U compinit

-compinit -i

deleted file mode 100644

@@ -1,3 +0,0 @@

-fpath=($ZSH/plugins/vagrant $fpath)

-autoload -U compinit

-compinit -i