Diff
1diff --git a/README.textile b/README.textile
2index 950f8861bc7ecbc25cd3544bf33e71cfb04a1ae7..8b1b6875a516e0cde5783df464f6eea1ff368721 100644
3--- a/README.textile
4+++ b/README.textile
5@@ -4,6 +4,8 @@ bq. "OH MY ZSHELL!"
6
7 h2. Setup
8
9+@oh-my-zsh@ should work with any recent release of "zsh":http://www.zsh.org/, the minimum recommended version is 4.3.9.
10+
11 h3. The automatic installer... (do you trust me?)
12
13 @wget http://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
14@@ -25,22 +27,19 @@ h3. The manual way
15
16 @chsh -s /bin/zsh@
17
18-4. Start / restart zsh (open a new terminal is easy enough..)
19+4. Start / restart zsh (open a new terminal is easy enough...)
20
21 h3. Problems?
22
23-You _might_ need to modify your PATH in ~/.zshrc if you're not able to find some commands after switching to oh-my-zsh.
24+You _might_ need to modify your PATH in ~/.zshrc if you're not able to find some commands after switching to _Oh My Zsh_.
25
26 h2. Usage
27
28-TODO: Update this..
29-
30-* Rake autocomplete: @rake (tab)@. Will generate a cache of all your rake tasks and then let you auto-complete and/or select the task to run.
31-* ssh autocomplete: @ssh (tab)@ or @scp (tab)@
32-* Git branch, it'll tell you which branch you're in when you're in a git repository directory.
33+* enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)
34+** example: @plugins=(git osx ruby)@
35 * Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@.
36-** Take a look at the "current themes":http://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with Oh My Zsh.
37-* much much more..
38+** Take a look at the "current themes":http://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with _Oh My Zsh_.
39+* much much more... take a look at @lib/@ what _Oh My Zsh_ offers...
40
41 h2. Useful
42
43@@ -49,6 +48,7 @@ the "refcard":http://www.bash2zsh.com/zsh_refcard/refcard.pdf is pretty tasty fo
44 h3. Customization
45
46 If you want to override any of the default behavior, just add a new file (ending in @.zsh@) into the @custom/@ directory.
47+If you have many functions which go good together you can put them as a *.plugin.zsh file in the @plugin/@ directory and then enable this plugin.
48
49 h3. Uninstalling
50
51@@ -66,8 +66,4 @@ I'm far from being a zsh-expert and suspect there are many ways to improve. If y
52
53 h3. Send us your theme!
54
55-I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.
56-
57-h3. Todo from imajes:
58-
59-* need to make the title bar support git folder
60+I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.
61diff --git a/lib/aliases.zsh b/lib/aliases.zsh
62index 89c904a7e5f9853a9caf5a55c7d90f90f1dc9418..80760a1f526e612a637e7c9c1898fbd8fb8f37f7 100644
63--- a/lib/aliases.zsh
64+++ b/lib/aliases.zsh
65@@ -18,7 +18,7 @@ alias history='fc -l 1'
66 # List direcory contents
67 alias lsa='ls -lah'
68 alias l='ls -la'
69-alias ll='ls -alr'
70+alias ll='ls -l'
71 alias sl=ls # often screw this up
72
73 alias afind='ack-grep -il'
74diff --git a/lib/correction.zsh b/lib/correction.zsh
75index a96f7ffd8d1231770a804bb45564ba17a6dd6b93..fc60dcdbdbead80c8336e4aaeaeb53dc657fce57 100644
76--- a/lib/correction.zsh
77+++ b/lib/correction.zsh
78@@ -6,3 +6,5 @@ alias mysql='nocorrect mysql'
79 alias mkdir='nocorrect mkdir'
80 alias gist='nocorrect gist'
81 alias heroku='nocorrect heroku'
82+alias ebuild='nocorrect ebuild'
83+alias hpodder='nocorrect hpodder'
84diff --git a/lib/history.zsh b/lib/history.zsh
85index 509be8f09aa718f7ca95d10cab0edaaf876f7f61..ca6f57079aef8e953154aa176159c8635e333228 100644
86--- a/lib/history.zsh
87+++ b/lib/history.zsh
88@@ -10,6 +10,7 @@ setopt hist_verify
89 setopt inc_append_history
90 setopt extended_history
91 setopt hist_expire_dups_first
92+setopt hist_ignore_space
93
94 setopt SHARE_HISTORY
95 setopt APPEND_HISTORY
96diff --git a/plugins/mysql-macports.plugin.zsh b/plugins/mysql-macports.plugin.zsh
97new file mode 100644
98index 0000000000000000000000000000000000000000..63b881c9f5b74f8f11770b20fe40749add1f23ae
99--- /dev/null
100+++ b/plugins/mysql-macports.plugin.zsh
101@@ -0,0 +1,6 @@
102+# commands to control local mysql-server installation
103+# paths are for osx installtion via macports
104+
105+alias mysqlstart='sudo /opt/local/bin/mysqld_safe5'
106+alias mysqlstop='/opt/local/bin/mysqladmin5 -u root -p shutdown'
107+alias mysqlstatus='mysqladmin5 -u root -p ping'
108diff --git a/themes/takashiyoshida.zsh-theme b/themes/takashiyoshida.zsh-theme
109new file mode 100644
110index 0000000000000000000000000000000000000000..419a8cf3f45366ab5e4d1f5b15bd49e392e94dc7
111--- /dev/null
112+++ b/themes/takashiyoshida.zsh-theme
113@@ -0,0 +1,27 @@
114+#
115+# PROMPT
116+#
117+PROMPT_BRACKET_BEGIN='%{$fg_bold[white]%}['
118+PROMPT_HOST='%{$fg_bold[cyan]%}%m'
119+PROMPT_SEPARATOR='%{$reset_color%}:'
120+PROMPT_DIR='%{$fg_bold[yellow]%}%c'
121+PROMPT_BRACKET_END='%{$fg_bold[white]%}]'
122+
123+PROMPT_USER='%{$fg_bold[white]%}%n'
124+PROMPT_SIGN='%{$reset_color%}%#'
125+
126+GIT_PROMPT_INFO='$(git_prompt_info)'
127+
128+# My current prompt looks like:
129+# [host:current_dir] (git_prompt_info)
130+# [username]%
131+PROMPT="${PROMPT_BRACKET_BEGIN}${PROMPT_HOST}${PROMPT_SEPARATOR}${PROMPT_DIR}${PROMPT_BRACKET_END}${GIT_PROMPT_INFO}
132+${PROMPT_BRACKET_BEGIN}${PROMPT_USER}${PROMPT_BRACKET_END}${PROMPT_SIGN} "
133+
134+#
135+# Git repository
136+#
137+ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
138+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
139+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!"
140+ZSH_THEME_GIT_PROMPT_CLEAN=''