Merge branch master

7 files changed, 31 insertions, 2 deletions

diff --git a/README.textile b/README.textile
index fdfb6afae..f09feec0e 100644
--- a/README.textile
+++ b/README.textile
@@ -38,6 +38,7 @@ TODO: Update this..
 * 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.
 * ssh autocomplete: @ssh (tab)@ or @scp (tab)@
 * Git branch, it'll tell you which branch you're in when you're in a git repository directory.
+* Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@.
 * much much more..
 
 h2. Thanks
@@ -49,4 +50,7 @@ h2. Help out!
 
 I'm far from being a zsh-expert and suspect there are many ways to improve. If you have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send pull requests!
 
+h3. Send us your theme!
+
+I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.
 
diff --git a/prompt.zsh b/prompt.zsh
index d191af7f5..31c33feb5 100644
--- a/prompt.zsh
+++ b/prompt.zsh
@@ -29,5 +29,4 @@ setopt prompt_subst
 
 export LSCOLORS="Gxfxcxdxbxegedabagacad"
 
-# PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
-PROMPT='%m:%1/$(git_prompt_info) %n\$ '
+source "$ZSH/themes/$ZSH_THEME.zsh-theme"
diff --git a/themes/evan.zsh-theme b/themes/evan.zsh-theme
new file mode 100644
index 000000000..5ef1f40dd
--- /dev/null
+++ b/themes/evan.zsh-theme
@@ -0,0 +1,2 @@
+# Evan describes this sexy prompt as: "a skinny, topless prompt"
+PROMPT='%m :: %2~ %B»%b '
\ No newline at end of file
diff --git a/themes/example.zsh-theme b/themes/example.zsh-theme
new file mode 100644
index 000000000..dbd9dc9c9
--- /dev/null
+++ b/themes/example.zsh-theme
@@ -0,0 +1,5 @@
+# Found on the ZshWiki
+#  http://zshwiki.org/home/config/prompt
+#
+
+PROMPT="%{$fg[red]%}%n%{$reset_color%}@%{$fg[blue]%}%m %{$fg[yellow]%}%~ %{$reset_color%}%% "
\ No newline at end of file
diff --git a/themes/funky.zsh-theme b/themes/funky.zsh-theme
new file mode 100644
index 000000000..2451296d9
--- /dev/null
+++ b/themes/funky.zsh-theme
@@ -0,0 +1,14 @@
+# Taken from Tassilo's Blog
+# http://tsdh.wordpress.com/2007/12/06/my-funky-zsh-prompt/
+
+local blue_op="%{$fg[blue]%}[%{$reset_color%}"
+local blue_cp="%{$fg[blue]%}]%{$reset_color%}"
+local path_p="${blue_op}%~${blue_cp}"
+local user_host="${blue_op}%n@%m${blue_cp}"
+local ret_status="${blue_op}%?${blue_cp}"
+local hist_no="${blue_op}%h${blue_cp}"
+local smiley="%(?,%{$fg[green]%}:%)%{$reset_color%},%{$fg[red]%}:(%{$reset_color%})"
+PROMPT="╭─${path_p}─${user_host}─${ret_status}─${hist_no}
+╰─${blue_op}${smiley}${blue_cp} %# "
+local cur_cmd="${blue_op}%_${blue_cp}"
+PROMPT2="${cur_cmd}> "
\ No newline at end of file
diff --git a/themes/robbyrussell.zsh-theme b/themes/robbyrussell.zsh-theme
new file mode 100644
index 000000000..d45796f7c
--- /dev/null
+++ b/themes/robbyrussell.zsh-theme
@@ -0,0 +1 @@
+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
diff --git a/zshrc b/zshrc
index d5c00d6df..2e2a33d9b 100644
--- a/zshrc
+++ b/zshrc
@@ -1,6 +1,10 @@
 # Path to your oh-my-zsh configuration.
 export ZSH=$HOME/.oh-my-zsh
 
+# Set to the name theme to load.
+# Look in ~/.oh-my-zsh/themes/
+export ZSH_THEME="robbyrussell"
+
 # 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 i in $ZSH/*zsh; do source $i; done;