@@ -10,14 +10,23 @@ 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

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

+# Add all defined plugins to fpath

 plugin=${plugin:=()}

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

+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

+for plugin ($plugins)

+do

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

+  then

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

+  fi

+done

+

 # Load the theme

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

deleted file mode 100644

@@ -1,2 +0,0 @@

-# add brew completion function to path

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

deleted file mode 100644

@@ -1,2 +0,0 @@

-# add cpanm completion function to path

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

deleted file mode 100644

@@ -1,2 +0,0 @@

-# add gem completion function to path

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

deleted file mode 100644

@@ -1,2 +0,0 @@

-# add github completion function to path

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

@@ -6,5 +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)

deleted file mode 100644

@@ -1,2 +0,0 @@

-# add brew completion function to path

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

deleted file mode 100644

@@ -1 +0,0 @@

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