From 9d053e47f887303f7c331b778fca2c92c3be535e Mon Sep 17 00:00:00 2001 From: David Robertson Date: Fri, 30 Mar 2012 19:11:14 +0100 Subject: [PATCH 1/5] Added my theme :) --- themes/davidrobertson.zsh-theme | 45 +++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 themes/davidrobertson.zsh-theme diff --git a/themes/davidrobertson.zsh-theme b/themes/davidrobertson.zsh-theme new file mode 100644 index 000000000..ceba95ee9 --- /dev/null +++ b/themes/davidrobertson.zsh-theme @@ -0,0 +1,45 @@ +# ------------------------------------------------------------------------ +# David Robertson's oh-my-zsh theme (basically a hybrid of the default robbyrussell theme and juanghurtado theme) +# (Needs Git plugin for current_branch method) +# ------------------------------------------------------------------------ + + +# Color shortcuts +RED=$fg[red] +YELLOW=$fg[yellow] +GREEN=$fg[green] +WHITE=$fg[white] +BLUE=$fg[blue] +RED_BOLD=$fg_bold[red] +YELLOW_BOLD=$fg_bold[yellow] +GREEN_BOLD=$fg_bold[green] +WHITE_BOLD=$fg_bold[white] +BLUE_BOLD=$fg_bold[blue] +RESET_COLOR=$reset_color + +# Format for git_prompt_info() +ZSH_THEME_GIT_PROMPT_PREFIX="" +ZSH_THEME_GIT_PROMPT_SUFFIX="" + +# Format for parse_git_dirty() +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RED%}✗" +ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GREEN%}✓" + +# Format for git_prompt_status() +ZSH_THEME_GIT_PROMPT_UNMERGED=" %{$RED%}unmerged" +ZSH_THEME_GIT_PROMPT_DELETED=" %{$RED%}deleted" +ZSH_THEME_GIT_PROMPT_RENAMED=" %{$YELLOW%}renamed" +ZSH_THEME_GIT_PROMPT_MODIFIED=" %{$YELLOW%}modified" +ZSH_THEME_GIT_PROMPT_ADDED=" %{$GREEN%}added" +ZSH_THEME_GIT_PROMPT_UNTRACKED=" %{$WHITE%}untracked" + +# Format for git_prompt_ahead() +ZSH_THEME_GIT_PROMPT_AHEAD=" %{$RED%}⇑" + +# Format for git_prompt_long_sha() and git_prompt_short_sha() +ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$WHITE%}[%{$YELLOW%}" +ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$WHITE%}]" + +# Prompt format +PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' +RPROMPT='%{$GREEN_BOLD%}$(current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}' From ac7a1b117bb125fa46dde77b7b4fd450fa60e3c6 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Sat, 31 Mar 2012 11:04:14 +0100 Subject: [PATCH 2/5] Capitalized first letter of each git status keyword. --- themes/davidrobertson.zsh-theme | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/themes/davidrobertson.zsh-theme b/themes/davidrobertson.zsh-theme index ceba95ee9..9e428f1d6 100644 --- a/themes/davidrobertson.zsh-theme +++ b/themes/davidrobertson.zsh-theme @@ -26,12 +26,12 @@ ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RED%}✗" ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GREEN%}✓" # Format for git_prompt_status() -ZSH_THEME_GIT_PROMPT_UNMERGED=" %{$RED%}unmerged" -ZSH_THEME_GIT_PROMPT_DELETED=" %{$RED%}deleted" -ZSH_THEME_GIT_PROMPT_RENAMED=" %{$YELLOW%}renamed" -ZSH_THEME_GIT_PROMPT_MODIFIED=" %{$YELLOW%}modified" -ZSH_THEME_GIT_PROMPT_ADDED=" %{$GREEN%}added" -ZSH_THEME_GIT_PROMPT_UNTRACKED=" %{$WHITE%}untracked" +ZSH_THEME_GIT_PROMPT_UNMERGED=" %{$RED%}Unmerged" +ZSH_THEME_GIT_PROMPT_DELETED=" %{$RED%}Deleted" +ZSH_THEME_GIT_PROMPT_RENAMED=" %{$YELLOW%}Renamed" +ZSH_THEME_GIT_PROMPT_MODIFIED=" %{$YELLOW%}Modified" +ZSH_THEME_GIT_PROMPT_ADDED=" %{$GREEN%}Added" +ZSH_THEME_GIT_PROMPT_UNTRACKED=" %{$WHITE%}Untracked" # Format for git_prompt_ahead() ZSH_THEME_GIT_PROMPT_AHEAD=" %{$RED%}⇑" From 59c87b9202e47f2831e4845274c6799c2a77afd7 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Sun, 17 Jun 2012 21:05:35 +0200 Subject: [PATCH 3/5] Update master --- tools/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install.sh b/tools/install.sh index aedb706da..1599b1ade 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -5,7 +5,7 @@ then fi echo "\033[0;34mCloning Oh My Zsh...\033[0m" -/usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh +/usr/bin/env git clone https://github.com/DavidJRobertson/oh-my-zsh.git ~/.oh-my-zsh echo "\033[0;34mLooking for an existing zsh config...\033[0m" if [ -f ~/.zshrc ] || [ -h ~/.zshrc ] From b013ab3964d7abb56c41e4cbaad7848e7116a246 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Sun, 21 Oct 2012 01:30:37 +0100 Subject: [PATCH 4/5] Updated ~/.zshrc template --- templates/zshrc.zsh-template | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index e52553241..901880a7f 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -5,11 +5,11 @@ ZSH=$HOME/.oh-my-zsh # Look in ~/.oh-my-zsh/themes/ # Optionally, if you set this to "random", it'll load a random theme each # time that oh-my-zsh is loaded. -ZSH_THEME="robbyrussell" +ZSH_THEME="davidrobertson" # Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" +alias zshconfig="vim ~/.zshrc" +alias ohmyzsh="vim ~/.oh-my-zsh" # Set to this to use case-sensitive completion # CASE_SENSITIVE="true" @@ -24,13 +24,20 @@ ZSH_THEME="robbyrussell" # DISABLE_AUTO_TITLE="true" # Uncomment following line if you want red dots to be displayed while waiting for completion -# COMPLETION_WAITING_DOTS="true" +COMPLETION_WAITING_DOTS="true" + +[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" + # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) -plugins=(git) - +plugins=(git gem npm rails3 rake rvm redis-cli lol zsh-syntax-highlighting) +ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets root) source $ZSH/oh-my-zsh.sh # Customize to your needs... +export PATH=/home/david/.rvm/gems/ruby-1.9.3-p0/bin:/home/david/.rvm/gems/ruby-1.9.3-p0@global/bin:/home/david/.rvm/rubies/ruby-1.9.3-p0/bin:/home/david/.rvm/bin:/usr/lib/lightdm/lightdm:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/home/david/.rvm/bin + +export EDITOR=vim +unsetopt correctall From bfe7d08f04f41404a87a28df7056b58de08257cb Mon Sep 17 00:00:00 2001 From: David Roberton Date: Wed, 28 Nov 2012 19:26:06 +0000 Subject: [PATCH 5/5] Fixed README to point to my fork --- README.textile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.textile b/README.textile index a38e2d7cf..3042395ec 100644 --- a/README.textile +++ b/README.textile @@ -13,18 +13,18 @@ You can install this via the command line with either `curl` or `wget`. h4. via `curl` -@curl -L https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh@ +@curl -L https://github.com/davidjrobertson/oh-my-zsh/raw/master/tools/install.sh | sh@ h4. via `wget` -@wget --no-check-certificate https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@ +@wget --no-check-certificate https://github.com/davidjrobertson/oh-my-zsh/raw/master/tools/install.sh -O - | sh@ h3. The manual way 1. Clone the repository - @git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@ + @git clone git://github.com/davidjrobertson/oh-my-zsh.git ~/.oh-my-zsh@ 2. Create a new zsh config by copying the zsh template we've provided.