summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--README.textile5
-rw-r--r--custom/example.zsh (renamed from projects.zsh-example)0
-rw-r--r--lib/aliases.zsh (renamed from aliases.zsh)0
-rw-r--r--lib/colors.zsh (renamed from colors.zsh)0
-rw-r--r--lib/completion.zsh (renamed from completion.zsh)0
-rw-r--r--lib/functions.zsh (renamed from functions.zsh)0
-rw-r--r--lib/git.zsh (renamed from git.zsh)0
-rw-r--r--lib/grep.zsh (renamed from grep.zsh)0
-rw-r--r--lib/history.zsh (renamed from history.zsh)6
-rw-r--r--lib/key-bindings.zsh (renamed from key-bindings.zsh)0
-rw-r--r--lib/prompt.zsh (renamed from prompt.zsh)0
-rw-r--r--lib/rake_completion.zsh (renamed from rake_completion.zsh)4
-rw-r--r--oh-my-zsh.sh5
14 files changed, 16 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index e80740950..f84db6dc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
locals.zsh
log/.zsh_history
projects.zsh
+custom/*.zsh
+!custom/example.zsh \ No newline at end of file
diff --git a/README.textile b/README.textile
index 1735e150f..9972cf246 100644
--- 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 b/custom/example.zsh
index 28ffcae25..28ffcae25 100644
--- a/projects.zsh-example
+++ b/custom/example.zsh
diff --git a/aliases.zsh b/lib/aliases.zsh
index cd17781a6..cd17781a6 100644
--- a/aliases.zsh
+++ b/lib/aliases.zsh
diff --git a/colors.zsh b/lib/colors.zsh
index b2b08f929..b2b08f929 100644
--- a/colors.zsh
+++ b/lib/colors.zsh
diff --git a/completion.zsh b/lib/completion.zsh
index 795903d0d..795903d0d 100644
--- a/completion.zsh
+++ b/lib/completion.zsh
diff --git a/functions.zsh b/lib/functions.zsh
index 2fb096dd6..2fb096dd6 100644
--- a/functions.zsh
+++ b/lib/functions.zsh
diff --git a/git.zsh b/lib/git.zsh
index 9409c92db..9409c92db 100644
--- a/git.zsh
+++ b/lib/git.zsh
diff --git a/grep.zsh b/lib/grep.zsh
index 93c4270b6..93c4270b6 100644
--- a/grep.zsh
+++ b/lib/grep.zsh
diff --git a/history.zsh b/lib/history.zsh
index 356b6498b..527c32762 100644
--- a/history.zsh
+++ b/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 b/lib/key-bindings.zsh
index 87e47bab6..87e47bab6 100644
--- a/key-bindings.zsh
+++ b/lib/key-bindings.zsh
diff --git a/prompt.zsh b/lib/prompt.zsh
index 39689684f..39689684f 100644
--- a/prompt.zsh
+++ b/lib/prompt.zsh
diff --git a/rake_completion.zsh b/lib/rake_completion.zsh
index 239fe15a3..c425a625e 100644
--- a/rake_completion.zsh
+++ b/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
index b931f558a..6e73519b5 100644
--- 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