From 22a9aaae4600df3c5cf20cd050a2252be6cd1768 Mon Sep 17 00:00:00 2001 From: William Ting Date: Tue, 6 Mar 2012 14:39:03 -1000 Subject: [PATCH 1/5] add wting theme, based on gnzh with the addition of timestamping and fixing detection of local user rvm installs --- themes/wting.zsh-theme | 59 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 themes/wting.zsh-theme diff --git a/themes/wting.zsh-theme b/themes/wting.zsh-theme new file mode 100644 index 000000000..20bb5958c --- /dev/null +++ b/themes/wting.zsh-theme @@ -0,0 +1,59 @@ +# ZSH Theme - Preview: http://dl.dropbox.com/u/4109351/pics/gnzh-zsh-theme.png +# Based on gnzh theme, which is based on bira theme + +# load some modules +autoload -U colors zsh/terminfo # Used in the colour alias below +colors +setopt prompt_subst + +# make some aliases for the colours: (could use normal escape sequences too) +for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do + eval PR_$color='%{$fg[${(L)color}]%}' +done +eval PR_NO_COLOR="%{$terminfo[sgr0]%}" +eval PR_BOLD="%{$terminfo[bold]%}" + +# Check the UID +if [[ $UID -ge 1000 ]]; then # normal user + eval PR_USER='${PR_GREEN}%n${PR_NO_COLOR}' + eval PR_USER_OP='${PR_GREEN}%#${PR_NO_COLOR}' + local PR_PROMPT='$PR_NO_COLOR➤ $PR_NO_COLOR' +elif [[ $UID -eq 0 ]]; then # root + eval PR_USER='${PR_RED}%n${PR_NO_COLOR}' + eval PR_USER_OP='${PR_RED}%#${PR_NO_COLOR}' + local PR_PROMPT='$PR_RED➤ $PR_NO_COLOR' +fi + +# Check if we are on SSH or not +if [[ -n "$SSH_CLIENT" || -n "$SSH2_CLIENT" ]]; then + eval PR_HOST='${PR_YELLOW}%M${PR_NO_COLOR}' # SSH +else + eval PR_HOST='${PR_GREEN}%M${PR_NO_COLOR}' # no SSH +fi + +local return_code="%(?..%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})" +local date='${PR_GREEN}%D{%Y.%m.%d} ${PR_NO_COLOR}' +local time='${PR_GREEN}%D{%T %Z} ${PR_NO_COLOR}' + +local user_host='${PR_USER}${PR_CYAN}@${PR_HOST}' +local current_dir='%{$PR_BOLD$PR_BLUE%}%~%{$PR_NO_COLOR%}' + +# Retrieve Ruby environment info, load RVM if found +local ruby_env='' +if ${HOME}/.rvm/bin/rvm-prompt &> /dev/null; then # detect local rvm installation + ruby_env='%{$PR_RED%}‹$(${HOME}/.rvm/bin/rvm-prompt i v g s)›%{$PR_NO_COLOR%}' +elif which rvm-prompt &> /dev/null; then # detect system rvm installation + ruby_env='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}' +elif which rbenv &> /dev/null; then # detect Simple Ruby Version management + ruby_env='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}' +fi + +# Retrieve git info +local git_branch='$(git_prompt_info)%{$PR_NO_COLOR%}' + +PROMPT="╭─${user_host} ${current_dir} ${ruby_env} ${git_branch} +╰─$PR_PROMPT " +RPROMPT="${date}${time}" + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$PR_YELLOW%}‹" +ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$PR_NO_COLOR%}" From d825747e80e9dc406ede009e90aad43bec2d72d4 Mon Sep 17 00:00:00 2001 From: William Ting Date: Mon, 5 Mar 2012 19:03:15 -1000 Subject: [PATCH 2/5] check for autojump manual local installation in plugin --- plugins/autojump/autojump.plugin.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh index 6f0edb062..2229df092 100644 --- a/plugins/autojump/autojump.plugin.zsh +++ b/plugins/autojump/autojump.plugin.zsh @@ -3,6 +3,8 @@ if [ $commands[autojump] ]; then # check if autojump is installed . /usr/share/autojump/autojump.zsh elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation . /etc/profile.d/autojump.zsh + elif [ -f ~/.autojump/etc/profile.d/autojump.zsh ]; then # manual local installation + . ~/.autojump/etc/profile.d/autojump.zsh elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump ]; then # mac os x with brew . `brew --prefix`/etc/autojump fi From 7a548d943614814118efcbead10f77756a5c1efe Mon Sep 17 00:00:00 2001 From: William Ting Date: Tue, 6 Mar 2012 14:31:03 -1000 Subject: [PATCH 3/5] fix gnzh theme to detect local rvm installations --- themes/gnzh.zsh-theme | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/themes/gnzh.zsh-theme b/themes/gnzh.zsh-theme index 3c6b8a409..33f187bc6 100644 --- a/themes/gnzh.zsh-theme +++ b/themes/gnzh.zsh-theme @@ -6,7 +6,7 @@ autoload -U colors zsh/terminfo # Used in the colour alias below colors setopt prompt_subst -# make some aliases for the colours: (coud use normal escap.seq's too) +# make some aliases for the colours: (could use normal escape sequences too) for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do eval PR_$color='%{$fg[${(L)color}]%}' done @@ -25,7 +25,7 @@ elif [[ $UID -eq 0 ]]; then # root fi # Check if we are on SSH or not -if [[ -n "$SSH_CLIENT" || -n "$SSH2_CLIENT" ]]; then +if [[ -n "$SSH_CLIENT" || -n "$SSH2_CLIENT" ]]; then eval PR_HOST='${PR_YELLOW}%M${PR_NO_COLOR}' #SSH else eval PR_HOST='${PR_GREEN}%M${PR_NO_COLOR}' # no SSH @@ -36,12 +36,12 @@ local return_code="%(?..%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})" local user_host='${PR_USER}${PR_CYAN}@${PR_HOST}' local current_dir='%{$PR_BOLD$PR_BLUE%}%~%{$PR_NO_COLOR%}' local rvm_ruby='' -if which rvm-prompt &> /dev/null; then +if ${HOME}/.rvm/bin/rvm-prompt &> /dev/null; then # detect local user rvm installation + rvm_ruby='%{$PR_RED%}‹$(${HOME}/.rvm/bin/rvm-prompt i v g s)›%{$PR_NO_COLOR%}' +elif which rvm-prompt &> /dev/null; then # detect sysem-wide rvm installation rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}' -else - if which rbenv &> /dev/null; then - rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}' - fi +elif which rbenv &> /dev/null; then # detect Simple Ruby Version management + rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}' fi local git_branch='$(git_prompt_info)%{$PR_NO_COLOR%}' From 52d6533a7e5ef0184ed94e33393634fe0b950c3b Mon Sep 17 00:00:00 2001 From: William Ting Date: Tue, 6 Mar 2012 14:39:03 -1000 Subject: [PATCH 4/5] add wting theme, based on gnzh with the addition of timestamping and fixing detection of local user rvm installs --- themes/wting.zsh-theme | 59 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 themes/wting.zsh-theme diff --git a/themes/wting.zsh-theme b/themes/wting.zsh-theme new file mode 100644 index 000000000..20bb5958c --- /dev/null +++ b/themes/wting.zsh-theme @@ -0,0 +1,59 @@ +# ZSH Theme - Preview: http://dl.dropbox.com/u/4109351/pics/gnzh-zsh-theme.png +# Based on gnzh theme, which is based on bira theme + +# load some modules +autoload -U colors zsh/terminfo # Used in the colour alias below +colors +setopt prompt_subst + +# make some aliases for the colours: (could use normal escape sequences too) +for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do + eval PR_$color='%{$fg[${(L)color}]%}' +done +eval PR_NO_COLOR="%{$terminfo[sgr0]%}" +eval PR_BOLD="%{$terminfo[bold]%}" + +# Check the UID +if [[ $UID -ge 1000 ]]; then # normal user + eval PR_USER='${PR_GREEN}%n${PR_NO_COLOR}' + eval PR_USER_OP='${PR_GREEN}%#${PR_NO_COLOR}' + local PR_PROMPT='$PR_NO_COLOR➤ $PR_NO_COLOR' +elif [[ $UID -eq 0 ]]; then # root + eval PR_USER='${PR_RED}%n${PR_NO_COLOR}' + eval PR_USER_OP='${PR_RED}%#${PR_NO_COLOR}' + local PR_PROMPT='$PR_RED➤ $PR_NO_COLOR' +fi + +# Check if we are on SSH or not +if [[ -n "$SSH_CLIENT" || -n "$SSH2_CLIENT" ]]; then + eval PR_HOST='${PR_YELLOW}%M${PR_NO_COLOR}' # SSH +else + eval PR_HOST='${PR_GREEN}%M${PR_NO_COLOR}' # no SSH +fi + +local return_code="%(?..%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})" +local date='${PR_GREEN}%D{%Y.%m.%d} ${PR_NO_COLOR}' +local time='${PR_GREEN}%D{%T %Z} ${PR_NO_COLOR}' + +local user_host='${PR_USER}${PR_CYAN}@${PR_HOST}' +local current_dir='%{$PR_BOLD$PR_BLUE%}%~%{$PR_NO_COLOR%}' + +# Retrieve Ruby environment info, load RVM if found +local ruby_env='' +if ${HOME}/.rvm/bin/rvm-prompt &> /dev/null; then # detect local rvm installation + ruby_env='%{$PR_RED%}‹$(${HOME}/.rvm/bin/rvm-prompt i v g s)›%{$PR_NO_COLOR%}' +elif which rvm-prompt &> /dev/null; then # detect system rvm installation + ruby_env='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}' +elif which rbenv &> /dev/null; then # detect Simple Ruby Version management + ruby_env='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}' +fi + +# Retrieve git info +local git_branch='$(git_prompt_info)%{$PR_NO_COLOR%}' + +PROMPT="╭─${user_host} ${current_dir} ${ruby_env} ${git_branch} +╰─$PR_PROMPT " +RPROMPT="${date}${time}" + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$PR_YELLOW%}‹" +ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$PR_NO_COLOR%}" From 8e142d02ae77ac45335877aaac2c7725607fe312 Mon Sep 17 00:00:00 2001 From: William Ting Date: Sun, 15 Apr 2012 19:37:50 -1000 Subject: [PATCH 5/5] show python environment in shell prompt --- themes/wting.zsh-theme | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/themes/wting.zsh-theme b/themes/wting.zsh-theme index 20bb5958c..85fb64683 100644 --- a/themes/wting.zsh-theme +++ b/themes/wting.zsh-theme @@ -38,7 +38,11 @@ local time='${PR_GREEN}%D{%T %Z} ${PR_NO_COLOR}' local user_host='${PR_USER}${PR_CYAN}@${PR_HOST}' local current_dir='%{$PR_BOLD$PR_BLUE%}%~%{$PR_NO_COLOR%}' -# Retrieve Ruby environment info, load RVM if found +# Retrieve Python environment info +PYTHON_VER=`python -c 'import sys; print(sys.version[:5])'` +python_env='%{$PR_RED%}‹python-${PYTHON_VER}›%{$PR_NO_COLOR%}' + +# Retrieve Ruby environment info local ruby_env='' if ${HOME}/.rvm/bin/rvm-prompt &> /dev/null; then # detect local rvm installation ruby_env='%{$PR_RED%}‹$(${HOME}/.rvm/bin/rvm-prompt i v g s)›%{$PR_NO_COLOR%}' @@ -51,7 +55,7 @@ fi # Retrieve git info local git_branch='$(git_prompt_info)%{$PR_NO_COLOR%}' -PROMPT="╭─${user_host} ${current_dir} ${ruby_env} ${git_branch} +PROMPT="╭─${user_host} ${current_dir} ${python_env} ${ruby_env} ${git_branch} ╰─$PR_PROMPT " RPROMPT="${date}${time}"