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

plugins/brew.plugin.zsh

@@ -1,6 +1,6 @@
 #compdef brew
 
-# copied from _fink
+# imported from the latest homebrew contributions
 
 _brew_all_formulae() {
   formulae=(`brew search`)
@@ -12,19 +12,25 @@ _brew_installed_formulae() {
 
 local -a _1st_arguments
 _1st_arguments=(
-  'install:install a formula'
+  'cat:display formula file for a formula'
-  'remove:remove a formula'
+  'cleanup:uninstall unused and old versions of packages'
-  'search:search for a formula (/regex/ or string)'
+  'create:create a new formula'
-  'list:list files in a formula or not-installed formulae'
+  'deps:list dependencies and dependants of a formula'
-  'link:link a formula'
+  'doctor:audits your installation for common issues'
-  'unlink:unlink a formula'
+  'edit:edit a formula'
   'home:visit the homepage of a formula or the brew project'
   'info:information about a formula'
-  'prune:remove dead links'
+  'install:install a formula'
-  'update:freshen up links'
+  'link:link a formula'
+  'list:list files in a formula or not-installed formulae'
   'log:git commit log for a formula'
-  'create:create a new formula'
+  'outdated:list formulas for which a newer version is available'
-  'edit:edit a formula'
+  'prune:remove dead links'
+  'remove:remove a formula'
+  'search:search for a formula (/regex/ or string)'
+  'unlink:unlink a formula'
+  'update:freshen up links'
+  'uses:show formulas which depend on a formula'
 )
 
 local expl
@@ -47,12 +53,12 @@ case "$words[1]" in
     _arguments \
       '(--unbrewed)--unbrewed[files in brew --prefix not controlled by brew]' \
       '1: :->forms' &&  return 0
-      
+
       if [[ "$state" == forms ]]; then
         _brew_installed_formulae
         _requested installed_formulae expl 'installed formulae' compadd -a installed_formulae
       fi ;;
-  install|home|log|info)
+  install|home|log|info|uses|cat|deps)
     _brew_all_formulae
     _wanted formulae expl 'all formulae' compadd -a formulae ;;
   remove|edit|xo)

themes/candy.zsh-theme

@@ -0,0 +1,7 @@
+PROMPT=$'%{$fg_bold[green]%}%n@%m %{$fg[blue]%}%D{[%I:%M:%S]} %{$reset_color%}%{$fg[white]%}[%~]%{$reset_color%} $(git_prompt_info)\
+%{$fg[blue]%}->%{$fg_bold[blue]%} %#%{$reset_color%} '
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""

themes/josh.zsh-theme

@@ -0,0 +1,43 @@
+grey='\e[0;90m'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$grey%}("
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$grey%}) %{$fg[yellow]%}✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$grey%})"
+
+function josh_prompt {
+  (( spare_width = ${COLUMNS} ))
+  prompt=" "
+
+  branch=$(current_branch)
+  ruby_version=$(rvm_prompt_info)
+  path_size=${#PWD}
+  branch_size=${#branch}
+  ruby_size=${#ruby_version}
+  user_machine_size=${#${(%):-%n@%m-}}
+  
+  if [[ ${#branch} -eq 0 ]]
+    then (( ruby_size = ruby_size + 1 ))
+  else
+    (( branch_size = branch_size + 4 ))
+    if [[ -n $(git status -s 2> /dev/null) ]]; then
+      (( branch_size = branch_size + 2 ))
+    fi
+  fi
+  
+  (( spare_width = ${spare_width} - (${user_machine_size} + ${path_size} + ${branch_size} + ${ruby_size}) ))
+
+  while [ ${#prompt} -lt $spare_width ]; do
+    prompt=" $prompt"
+  done
+  
+  prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info)%{$reset_color%} $(git_prompt_info)"
+  
+  echo $prompt
+}
+
+setopt prompt_subst
+
+PROMPT='
+%n@%m $(josh_prompt)
+%(?,%{%F{green}%},%{%F{red}%})⚡%{$reset_color%} '

themes/mrtazz.zsh-theme

@@ -0,0 +1,7 @@
+PROMPT='%{$fg_bold[red]%}%m%{$reset_color%}:%{$fg[cyan]%}%c%{$reset_color%}:%# '
+RPROMPT='%{$fg_bold[green]%}$(git_prompt_info)%{$reset_color%}% '
+
+ZSH_THEME_GIT_PROMPT_PREFIX="<%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%} %{$fg[yellow]%}✗%{$fg[green]%}>%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}>"

tools/install.sh

@@ -22,7 +22,7 @@ echo "Copying your current PATH and adding it to the end of ~/.zshrc for you."
 echo "export PATH=$PATH" >> ~/.zshrc
 
 echo "Time to change your default shell to zsh!"
-chsh -s /bin/zsh
+chsh -s "/usr/bin/env zsh"
 
 echo '         __                                     __  '
 echo '  ____  / /_     ____ ___  __  __   ____  _____/ /_ '
@@ -32,5 +32,5 @@ echo '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
 echo '                        /____/'
 
 echo "\n\n ....is now installed."
-/bin/zsh
+/usr/bin/env zsh
 source ~/.zshrc