merge upstream

oteyatosys · Sep 23, 2009 · 8a8a7ba · 8a8a7ba
2 parents 71b1c60 + ff545e6
commit 8a8a7ba
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 locals.zsh
 log/.zsh_history
 projects.zsh
+custom/*.zsh
+!custom/example.zsh
diff --git a/README.textile b/README.textile
@@ -43,8 +43,13 @@ TODO: Update this..
 * much much more..
 
 h2. Useful
+
 the "refcard":http://www.bash2zsh.com/zsh_refcard/refcard.pdf is pretty tasty for tips.
 
+h3. Customization
+
+If you want to override any of the default behavior, just add a new file (ending in @.zsh@) into the @custom/@ directory.
+
 h3. Uninstalling
 
 If you want to uninstall it, just run @uninstall_oh_my_zsh@ from the command line and it'll remove itself and revert you to bash (or your previous zsh config).

diff --git a/projects.zsh-example → custom/example.zsh b/projects.zsh-example → custom/example.zsh
diff --git a/aliases.zsh → lib/aliases.zsh b/aliases.zsh → lib/aliases.zsh
diff --git a/colors.zsh → lib/colors.zsh b/colors.zsh → lib/colors.zsh
diff --git a/completion.zsh → lib/completion.zsh b/completion.zsh → lib/completion.zsh
diff --git a/functions.zsh → lib/functions.zsh b/functions.zsh → lib/functions.zsh
diff --git a/git.zsh → lib/git.zsh b/git.zsh → lib/git.zsh
diff --git a/grep.zsh → lib/grep.zsh b/grep.zsh → lib/grep.zsh
diff --git a/history.zsh → lib/history.zsh b/history.zsh → lib/history.zsh
@@ -1,8 +1,8 @@
 ## Command history configuration
-#
 HISTFILE=$HOME/.zsh_history
-HISTSIZE=5000
-SAVEHIST=5000
+HISTSIZE=10000
+SAVEHIST=10000
+
 setopt hist_ignore_dups # ignore duplication command history list
 setopt share_history # share command history data
 

diff --git a/key-bindings.zsh → lib/key-bindings.zsh b/key-bindings.zsh → lib/key-bindings.zsh
diff --git a/prompt.zsh → lib/prompt.zsh b/prompt.zsh → lib/prompt.zsh
diff --git a/rake_completion.zsh → lib/rake_completion.zsh b/rake_completion.zsh → lib/rake_completion.zsh
@@ -17,7 +17,7 @@ _rake () {
   fi
 }
 
-compdef _rake rake
+compctl -K _rake rake
 
 function _cap_does_task_list_need_generating () {
   if [ ! -f .cap_tasks~ ]; then return 0;
@@ -39,4 +39,4 @@ function _cap () {
   fi
 }
 
-compdef _cap cap
+compctl -K _cap cap
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
@@ -2,4 +2,7 @@
 
 # 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/*.zsh) source $config_file
+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