From 2759586aae5bea9ec38bb16403381c73589776ed Mon Sep 17 00:00:00 2001 From: Robby Russell Date: Tue, 22 Sep 2009 20:36:28 -0700 Subject: [PATCH 1/7] Using compctl instead of compdef to resolve Issue #1 --- rake_completion.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rake_completion.zsh b/rake_completion.zsh index 239fe15a3502..c425a625e1d2 100644 --- a/rake_completion.zsh +++ b/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 From 8debd097fbea09032c27b2c8d69d8430d7ea0551 Mon Sep 17 00:00:00 2001 From: Robby Russell Date: Wed, 23 Sep 2009 07:43:36 -0700 Subject: [PATCH 2/7] Moving all zsh config options into a lib/ subdirectory to make way for some upcoming changes to directory structure and configuration options --- aliases.zsh => lib/aliases.zsh | 0 colors.zsh => lib/colors.zsh | 0 completion.zsh => lib/completion.zsh | 0 functions.zsh => lib/functions.zsh | 0 git.zsh => lib/git.zsh | 0 grep.zsh => lib/grep.zsh | 0 history.zsh => lib/history.zsh | 0 key-bindings.zsh => lib/key-bindings.zsh | 0 prompt.zsh => lib/prompt.zsh | 0 rake_completion.zsh => lib/rake_completion.zsh | 0 oh-my-zsh.sh | 2 +- 11 files changed, 1 insertion(+), 1 deletion(-) rename aliases.zsh => lib/aliases.zsh (100%) rename colors.zsh => lib/colors.zsh (100%) rename completion.zsh => lib/completion.zsh (100%) rename functions.zsh => lib/functions.zsh (100%) rename git.zsh => lib/git.zsh (100%) rename grep.zsh => lib/grep.zsh (100%) rename history.zsh => lib/history.zsh (100%) rename key-bindings.zsh => lib/key-bindings.zsh (100%) rename prompt.zsh => lib/prompt.zsh (100%) rename rake_completion.zsh => lib/rake_completion.zsh (100%) diff --git a/aliases.zsh b/lib/aliases.zsh similarity index 100% rename from aliases.zsh rename to lib/aliases.zsh diff --git a/colors.zsh b/lib/colors.zsh similarity index 100% rename from colors.zsh rename to lib/colors.zsh diff --git a/completion.zsh b/lib/completion.zsh similarity index 100% rename from completion.zsh rename to lib/completion.zsh diff --git a/functions.zsh b/lib/functions.zsh similarity index 100% rename from functions.zsh rename to lib/functions.zsh diff --git a/git.zsh b/lib/git.zsh similarity index 100% rename from git.zsh rename to lib/git.zsh diff --git a/grep.zsh b/lib/grep.zsh similarity index 100% rename from grep.zsh rename to lib/grep.zsh diff --git a/history.zsh b/lib/history.zsh similarity index 100% rename from history.zsh rename to lib/history.zsh diff --git a/key-bindings.zsh b/lib/key-bindings.zsh similarity index 100% rename from key-bindings.zsh rename to lib/key-bindings.zsh diff --git a/prompt.zsh b/lib/prompt.zsh similarity index 100% rename from prompt.zsh rename to lib/prompt.zsh diff --git a/rake_completion.zsh b/lib/rake_completion.zsh similarity index 100% rename from rake_completion.zsh rename to lib/rake_completion.zsh diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index b931f558aaa7..40c73cb49cd9 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -2,4 +2,4 @@ # 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 From 107322c2e86db377cc8260958a4b6e26ea849a67 Mon Sep 17 00:00:00 2001 From: Robby Russell Date: Wed, 23 Sep 2009 08:02:58 -0700 Subject: [PATCH 3/7] Moving some example files into custom/ --- projects.zsh-example => custom/example.zsh | 0 oh-my-zsh.sh | 3 +++ 2 files changed, 3 insertions(+) rename projects.zsh-example => custom/example.zsh (100%) diff --git a/projects.zsh-example b/custom/example.zsh similarity index 100% rename from projects.zsh-example rename to custom/example.zsh diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index 40c73cb49cd9..6e73519b5d3d 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -3,3 +3,6 @@ # 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 + +# Load all of your custom configurations from custom/ +for config_file ($ZSH/custom/*.zsh) source $config_file From ef9ce1e221e048b83edbe4def12d4b3a5c1c6dcb Mon Sep 17 00:00:00 2001 From: Robby Russell Date: Wed, 23 Sep 2009 08:03:38 -0700 Subject: [PATCH 4/7] Updating .gitignore to ignore everything but the example.zsh file in custom/ --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 56d0a21228f7..e79e3ee0bae1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ log/.zsh_history -projects.zsh +custom/*.zsh +# !custom/example.zsh + From 19a08f15d6a09b8c7a1f4f306abe6e61bdf7d95d Mon Sep 17 00:00:00 2001 From: Robby Russell Date: Wed, 23 Sep 2009 08:05:05 -0700 Subject: [PATCH 5/7] not ignoring example.zsh --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e79e3ee0bae1..551ba0bdf4c2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ log/.zsh_history custom/*.zsh -# !custom/example.zsh +!custom/example.zsh From 1dc73537320ff86b7597fc097ad82c58aeba0566 Mon Sep 17 00:00:00 2001 From: Robby Russell Date: Wed, 23 Sep 2009 08:06:32 -0700 Subject: [PATCH 6/7] Updating README to mention custom/ directory --- README.textile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.textile b/README.textile index bf4086916e6b..787a9050ec0e 100644 --- a/README.textile +++ b/README.textile @@ -42,6 +42,10 @@ TODO: Update this.. ** Take a look at the "current themes":http://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with Oh My Zsh. * much much more.. +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). From ff545e6934b70945e778495f613d41a43681b662 Mon Sep 17 00:00:00 2001 From: Robby Russell Date: Wed, 23 Sep 2009 08:07:02 -0700 Subject: [PATCH 7/7] Bumping up history to 10k commands --- lib/history.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/history.zsh b/lib/history.zsh index a093aa27ca58..f7b63b7cddef 100644 --- a/lib/history.zsh +++ b/lib/history.zsh @@ -8,8 +8,8 @@ setopt HIST_IGNORE_DUPS ## Command history configuration # HISTFILE=$ZSH/log/.zsh_history -HISTSIZE=2500 -SAVEHIST=2500 +HISTSIZE=10000 +SAVEHIST=10000 setopt hist_ignore_dups # ignore duplication command history list setopt share_history # share command history data