From b6af01722224929d7cde6026ae7222c747556e61 Mon Sep 17 00:00:00 2001 From: Marko Bauhardt Date: Sat, 16 Jun 2012 13:14:13 +0200 Subject: [PATCH 1/8] create emtpty file to start on my own theme --- themes/mbauhardt.zsh-theme | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 themes/mbauhardt.zsh-theme diff --git a/themes/mbauhardt.zsh-theme b/themes/mbauhardt.zsh-theme new file mode 100644 index 000000000..e69de29bb From af24fd536142331be367f05aaee8fc615b15698f Mon Sep 17 00:00:00 2001 From: Marko Bauhardt Date: Sat, 16 Jun 2012 13:24:20 +0200 Subject: [PATCH 2/8] change links in readme file to point to my fork --- README.textile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.textile b/README.textile index a38e2d7cf..7f317eaa2 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/mbauhardt/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/mbauhardt/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/mbauhardt/oh-my-zsh.git ~/.oh-my-zsh@ 2. Create a new zsh config by copying the zsh template we've provided. @@ -47,7 +47,7 @@ h2. Usage * enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible) ** example: @plugins=(git osx ruby)@ * Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@. -** Take a look at the "current themes":https://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with _Oh My Zsh_. +** Take a look at the "current themes":https://github.com/mbauhardt/oh-my-zsh/wiki/themes that come bundled with _Oh My Zsh_. * much much more... take a look at @lib/@ what _Oh My Zsh_ offers... h2. Useful @@ -81,6 +81,6 @@ h2. Contributors This project wouldn't exist without all of our awesome users and contributors. -* "View our growing list of contributors":https://github.com/robbyrussell/oh-my-zsh/contributors +* "View our growing list of contributors":https://github.com/mbauhardt/oh-my-zsh/contributors Thank you so much! From f874150a0b714fdcba9baed2d7ae5a3a1a073351 Mon Sep 17 00:00:00 2001 From: Marko Bauhardt Date: Sat, 16 Jun 2012 13:31:34 +0200 Subject: [PATCH 3/8] add my own theme and url to install --- templates/zshrc.zsh-template | 2 +- tools/install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index e52553241..cb11eb604 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -5,7 +5,7 @@ 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="mbauhardt" # Example aliases # alias zshconfig="mate ~/.zshrc" diff --git a/tools/install.sh b/tools/install.sh index 8ca427d2c..0e8ddb674 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -7,7 +7,7 @@ fi echo "\033[0;34mCloning Oh My Zsh...\033[0m" which git > /dev/null if [[ $? -eq 0 ]]; then - /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh + /usr/bin/env git clone https://github.com/mbauhardt/oh-my-zsh.git ~/.oh-my-zsh else echo "git not installed" exit From d3b2c9277f6254e044813201ae7b59a8f1eedc53 Mon Sep 17 00:00:00 2001 From: Marko Bauhardt Date: Thu, 21 Jun 2012 17:59:48 +0200 Subject: [PATCH 4/8] first version on my theme --- themes/mbauhardt.zsh-theme | 42 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/themes/mbauhardt.zsh-theme b/themes/mbauhardt.zsh-theme index e69de29bb..42d4501be 100644 --- a/themes/mbauhardt.zsh-theme +++ b/themes/mbauhardt.zsh-theme @@ -0,0 +1,42 @@ +RESET_COLOR=$reset_color +DATE_AND_TIME_COLOR=%F{015} +USER_COLOR=%F{166} +DIR_COLOR=%F{006} +GIT_INFO_COLOR=%F{005} + +MODIFIED_COLOR=%F{003} +ADDED_COLOR=%F{002} +DELETED_COLOR=%F{001} +RENAMED_COLOR=%F{003} +UNTRACKED_COLOR=%F{015} +UNMERGED_COLOR=%F{001} + +STAR=$(echo -e "\xE2\x98\x85") +FIRE=$(echo -e "\xF0\x9F\x94\xA5") +THUMBS_UP=$(echo -e "\xF0\x9F\x91\x8D") + + +PROMPT=' + +%{$USER_COLOR%}%n@%m %{$DIR_COLOR%}[%~] %{$GIT_INFO_COLOR%}$(git_prompt_info) $(git_prompt_status) %{$RESET_COLOR%} +> %{$RESET_COLOR%}' + +RPROMPT='%{$DATE_AND_COLOR%}%w,%t%{$RESET_COLOR%}' + + +# git_prompt_info() +ZSH_THEME_GIT_PROMPT_PREFIX="[git:" +ZSH_THEME_GIT_PROMPT_SUFFIX="]" + +# parse_git_dirty() +ZSH_THEME_GIT_PROMPT_DIRTY=" $FIRE " +ZSH_THEME_GIT_PROMPT_CLEAN=" $THUMBS_UP " + +# git_prompt_status() +ZSH_THEME_GIT_PROMPT_UNMERGED=" %{$UNMERGED_COLOR%}unmerged" +ZSH_THEME_GIT_PROMPT_DELETED=" %{$DELETED_COLOR%}deleted" +ZSH_THEME_GIT_PROMPT_RENAMED=" %{$RENAMED_COLOR%}renamed" +ZSH_THEME_GIT_PROMPT_MODIFIED=" %{$MODIFIED_COLOR%}modified" +ZSH_THEME_GIT_PROMPT_ADDED=" %{$ADDED_COLOR%}added" +ZSH_THEME_GIT_PROMPT_UNTRACKED=" %{$UNTRACKED_COLOR%}untracked" + From 7f3b495711aaddd14b36097b2249c053a6d9503a Mon Sep 17 00:00:00 2001 From: Marko Bauhardt Date: Fri, 22 Jun 2012 08:46:33 +0200 Subject: [PATCH 5/8] use percentage instead arrow --- themes/mbauhardt.zsh-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/mbauhardt.zsh-theme b/themes/mbauhardt.zsh-theme index 42d4501be..762408933 100644 --- a/themes/mbauhardt.zsh-theme +++ b/themes/mbauhardt.zsh-theme @@ -19,7 +19,7 @@ THUMBS_UP=$(echo -e "\xF0\x9F\x91\x8D") PROMPT=' %{$USER_COLOR%}%n@%m %{$DIR_COLOR%}[%~] %{$GIT_INFO_COLOR%}$(git_prompt_info) $(git_prompt_status) %{$RESET_COLOR%} -> %{$RESET_COLOR%}' +% %{$RESET_COLOR%}' RPROMPT='%{$DATE_AND_COLOR%}%w,%t%{$RESET_COLOR%}' From 34285b5b018318e93edc5d087a1adedf6b2f9cbb Mon Sep 17 00:00:00 2001 From: Marko Bauhardt Date: Fri, 22 Jun 2012 08:48:52 +0200 Subject: [PATCH 6/8] use ge sign instead of percentage sign --- themes/mbauhardt.zsh-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/mbauhardt.zsh-theme b/themes/mbauhardt.zsh-theme index 762408933..42d4501be 100644 --- a/themes/mbauhardt.zsh-theme +++ b/themes/mbauhardt.zsh-theme @@ -19,7 +19,7 @@ THUMBS_UP=$(echo -e "\xF0\x9F\x91\x8D") PROMPT=' %{$USER_COLOR%}%n@%m %{$DIR_COLOR%}[%~] %{$GIT_INFO_COLOR%}$(git_prompt_info) $(git_prompt_status) %{$RESET_COLOR%} -% %{$RESET_COLOR%}' +> %{$RESET_COLOR%}' RPROMPT='%{$DATE_AND_COLOR%}%w,%t%{$RESET_COLOR%}' From 4f91b8e6c04f8663a1fdd9d7d5a1c9fd6a829e2e Mon Sep 17 00:00:00 2001 From: Marko Bauhardt Date: Tue, 24 Jul 2012 20:00:57 +0200 Subject: [PATCH 7/8] Revert "change links in readme file to point to my fork" This reverts commit af24fd536142331be367f05aaee8fc615b15698f. --- README.textile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.textile b/README.textile index 7f317eaa2..a38e2d7cf 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/mbauhardt/oh-my-zsh/raw/master/tools/install.sh | sh@ +@curl -L https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh@ h4. via `wget` -@wget --no-check-certificate https://github.com/mbauhardt/oh-my-zsh/raw/master/tools/install.sh -O - | sh@ +@wget --no-check-certificate https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@ h3. The manual way 1. Clone the repository - @git clone git://github.com/mbauhardt/oh-my-zsh.git ~/.oh-my-zsh@ + @git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@ 2. Create a new zsh config by copying the zsh template we've provided. @@ -47,7 +47,7 @@ h2. Usage * enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible) ** example: @plugins=(git osx ruby)@ * Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@. -** Take a look at the "current themes":https://github.com/mbauhardt/oh-my-zsh/wiki/themes that come bundled with _Oh My Zsh_. +** Take a look at the "current themes":https://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with _Oh My Zsh_. * much much more... take a look at @lib/@ what _Oh My Zsh_ offers... h2. Useful @@ -81,6 +81,6 @@ h2. Contributors This project wouldn't exist without all of our awesome users and contributors. -* "View our growing list of contributors":https://github.com/mbauhardt/oh-my-zsh/contributors +* "View our growing list of contributors":https://github.com/robbyrussell/oh-my-zsh/contributors Thank you so much! From 760e294660e54505431388ce73752aba0b24fa69 Mon Sep 17 00:00:00 2001 From: Marko Bauhardt Date: Tue, 24 Jul 2012 20:02:14 +0200 Subject: [PATCH 8/8] Revert "add my own theme and url to install" This reverts commit f874150a0b714fdcba9baed2d7ae5a3a1a073351. --- templates/zshrc.zsh-template | 2 +- tools/install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index cb11eb604..e52553241 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -5,7 +5,7 @@ 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="mbauhardt" +ZSH_THEME="robbyrussell" # Example aliases # alias zshconfig="mate ~/.zshrc" diff --git a/tools/install.sh b/tools/install.sh index 0e8ddb674..8ca427d2c 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -7,7 +7,7 @@ fi echo "\033[0;34mCloning Oh My Zsh...\033[0m" which git > /dev/null if [[ $? -eq 0 ]]; then - /usr/bin/env git clone https://github.com/mbauhardt/oh-my-zsh.git ~/.oh-my-zsh + /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh else echo "git not installed" exit