Browse code

Merge branch 'master' of github.com:robbyrussell/oh-my-zsh

Robby Russell authored on 10/06/2010 at 14:50:24
Showing 6 changed files
... ...
@@ -4,6 +4,8 @@ bq. "OH MY ZSHELL!"
4 4
 
5 5
 h2. Setup
6 6
 
7
+@oh-my-zsh@ should work with any recent release of "zsh":http://www.zsh.org/, the minimum recommended version is 4.3.9.
8
+
7 9
 h3. The automatic installer... (do you trust me?)
8 10
 
9 11
 @wget http://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
... ...
@@ -25,22 +27,19 @@ h3. The manual way
25 25
 
26 26
   @chsh -s /bin/zsh@
27 27
 
28
-4. Start / restart zsh (open a new terminal is easy enough..)
28
+4. Start / restart zsh (open a new terminal is easy enough...)
29 29
 
30 30
 h3. Problems?
31 31
 
32
-You _might_ need to modify your PATH in ~/.zshrc if you're not able to find some commands after switching to oh-my-zsh.
32
+You _might_ need to modify your PATH in ~/.zshrc if you're not able to find some commands after switching to _Oh My Zsh_.
33 33
 
34 34
 h2. Usage
35 35
 
36
-TODO: Update this..
37
-
38
-* 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.
39
-* ssh autocomplete: @ssh (tab)@ or @scp (tab)@
40
-* Git branch, it'll tell you which branch you're in when you're in a git repository directory.
36
+* enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)
37
+** example: @plugins=(git osx ruby)@
41 38
 * Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@.
42
-** Take a look at the "current themes":http://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with Oh My Zsh.
43
-* much much more..
39
+** Take a look at the "current themes":http://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with _Oh My Zsh_.
40
+* much much more...  take a look at @lib/@ what _Oh My Zsh_ offers...
44 41
 
45 42
 h2. Useful
46 43
 
... ...
@@ -49,6 +48,7 @@ the "refcard":http://www.bash2zsh.com/zsh_refcard/refcard.pdf is pretty tasty fo
49 49
 h3. Customization
50 50
 
51 51
 If you want to override any of the default behavior, just add a new file (ending in @.zsh@) into the @custom/@ directory.
52
+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.
52 53
 
53 54
 h3. Uninstalling
54 55
 
... ...
@@ -66,8 +66,4 @@ I'm far from being a zsh-expert and suspect there are many ways to improve. If y
66 66
 
67 67
 h3. Send us your theme!
68 68
 
69
-I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.
70
-
71
-h3. Todo from imajes:
72
-
73
-* need to make the title bar support git folder
74 69
\ No newline at end of file
70
+I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.
75 71
\ No newline at end of file
... ...
@@ -18,7 +18,7 @@ alias history='fc -l 1'
18 18
 # List direcory contents
19 19
 alias lsa='ls -lah'
20 20
 alias l='ls -la'
21
-alias ll='ls -alr'
21
+alias ll='ls -l'
22 22
 alias sl=ls # often screw this up
23 23
 
24 24
 alias afind='ack-grep -il'
... ...
@@ -6,3 +6,5 @@ alias mysql='nocorrect mysql'
6 6
 alias mkdir='nocorrect mkdir'
7 7
 alias gist='nocorrect gist'
8 8
 alias heroku='nocorrect heroku'
9
+alias ebuild='nocorrect ebuild'
10
+alias hpodder='nocorrect hpodder'
... ...
@@ -10,6 +10,7 @@ setopt hist_verify
10 10
 setopt inc_append_history
11 11
 setopt extended_history
12 12
 setopt hist_expire_dups_first
13
+setopt hist_ignore_space
13 14
 
14 15
 setopt SHARE_HISTORY
15 16
 setopt APPEND_HISTORY
16 17
new file mode 100644
... ...
@@ -0,0 +1,6 @@
0
+# commands to control local mysql-server installation
1
+# paths are for osx installtion via macports
2
+
3
+alias mysqlstart='sudo /opt/local/bin/mysqld_safe5'
4
+alias mysqlstop='/opt/local/bin/mysqladmin5 -u root -p shutdown'
5
+alias mysqlstatus='mysqladmin5 -u root -p ping'
0 6
\ No newline at end of file
1 7
new file mode 100644
... ...
@@ -0,0 +1,27 @@
0
+#
1
+# PROMPT
2
+#
3
+PROMPT_BRACKET_BEGIN='%{$fg_bold[white]%}['
4
+PROMPT_HOST='%{$fg_bold[cyan]%}%m'
5
+PROMPT_SEPARATOR='%{$reset_color%}:'
6
+PROMPT_DIR='%{$fg_bold[yellow]%}%c'
7
+PROMPT_BRACKET_END='%{$fg_bold[white]%}]'
8
+
9
+PROMPT_USER='%{$fg_bold[white]%}%n'
10
+PROMPT_SIGN='%{$reset_color%}%#'
11
+
12
+GIT_PROMPT_INFO='$(git_prompt_info)'
13
+
14
+# My current prompt looks like:
15
+# [host:current_dir] (git_prompt_info)
16
+# [username]%
17
+PROMPT="${PROMPT_BRACKET_BEGIN}${PROMPT_HOST}${PROMPT_SEPARATOR}${PROMPT_DIR}${PROMPT_BRACKET_END}${GIT_PROMPT_INFO}
18
+${PROMPT_BRACKET_BEGIN}${PROMPT_USER}${PROMPT_BRACKET_END}${PROMPT_SIGN} "
19
+
20
+#
21
+# Git repository
22
+#
23
+ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
24
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
25
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!"
26
+ZSH_THEME_GIT_PROMPT_CLEAN=''