From 6c7183f364119263e58ecc73e846f4140a6ffb89 Mon Sep 17 00:00:00 2001
From: Simon Gomizelj <simongmzlj@gmail.com>
Date: Tue, 29 Nov 2011 07:00:05 -0500
Subject: [PATCH] Better split. Local directory is ~/.omz

---
 oh-my-zsh.zsh | 42 +++++++++++++++---------------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/oh-my-zsh.zsh b/oh-my-zsh.zsh
index fa0864826..0b5db7fca 100644
--- a/oh-my-zsh.zsh
+++ b/oh-my-zsh.zsh
@@ -1,43 +1,31 @@
 # Initializes Oh My Zsh
 ZSH=${ZSH:-/usr/share/oh-my-zsh/}
 
+local config_file plugin
+
 # add a function path
 fpath=($ZSH/functions $ZSH/completions $fpath)
-fpath=(~/.oh-my-zsh/functions ~/.oh-my-zsh/completions $fpath)
-
-# Load all of the config files in ~/oh-my-zsh that end in .zsh
-# TIP: Add files you don't want in git to .gitignore
 for config_file ($ZSH/lib/*.zsh) source $config_file
-for config_file (~/.oh-my-zsh/lib/*.zsh) source $config_file
-
-# Add all defined plugins to fpath
 plugin=${plugin:=()}
 for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)
-for plugin ($plugins) fpath=(~/.oh-my-zsh/plugins/$plugin $fpath)
+
+if [[ -d ~/.omz ]]; then
+  [[ -d ~/.omz/functions ]] && fpath=(~/.omz/functions $fpath)
+  [[ -d ~/.omz/completion ]] && fpath=(~/.omz/completions $fpath)
+
+  if [[ -d ~/.omz/lib ]]; then
+    for config_file (~/.omz/lib/*.zsh) source $config_file
+  fi
+
+  if [[ -d ~/.omz/plugins ]]; then
+    for plugin ($plugins) fpath=(~/.omz/plugins/$plugin $fpath)
+  fi
+fi
 
 # Load and run compinit
 autoload -U compinit
 compinit -i
 
-# Set ZSH_CUSTOM to the path where your custom config files
-# and plugins exists, or else we will use the default custom/
-# if [ "$ZSH_CUSTOM" = ""  ]
-# then
-#     ZSH_CUSTOM="$ZSH/custom"
-# fi
-
-# Load all of the plugins that were defined in ~/.zshrc
-# for plugin ($plugins); do
-#   if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then
-#     source $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh
-#   elif [ -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
 if [ "$ZSH_THEME" = "random" ]
 then