From 6a74231e7a3835a2e0d03644866158913e2d4547 Mon Sep 17 00:00:00 2001 From: Pandu POLUAN Date: Thu, 12 Oct 2017 16:52:34 +0700 Subject: [PATCH] New Theme: ys-pep Created a new theme "ys-pep" derived from the "ys" theme --- themes/ys-pep.zsh-theme | 92 ++++++++++++++++++++++++++++++++++++ themes/ys-pep.zsh-theme.orig | 79 +++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+) create mode 100644 themes/ys-pep.zsh-theme create mode 100644 themes/ys-pep.zsh-theme.orig diff --git a/themes/ys-pep.zsh-theme b/themes/ys-pep.zsh-theme new file mode 100644 index 000000000..6fa5e1350 --- /dev/null +++ b/themes/ys-pep.zsh-theme @@ -0,0 +1,92 @@ +# ys-pep Theme, based on ys Theme by Yad Smood +# +# ----- BEGIN Original Description ----- +# +# Clean, simple, compatible and meaningful. +# Tested on Linux, Unix and Windows under ANSI colors. +# It is recommended to use with a dark background. +# Colors: black, red, green, yellow, *blue, magenta, cyan, and white. +# +# Mar 2013 Yad Smood +# +# ----- END Original Description ----- +# +# Changes to ys theme: +# * Move timestamp to the front and make it darker +# * List current IP addresses +# * GCE hook (for controlling Google Cloud) +# * Virtualenv hook +# +# Sep-Oct 2017 Pandu POLUAN + +# VCS +YS_VCS_PROMPT_PREFIX1=" %{$fg[white]%}on%{$reset_color%} " +YS_VCS_PROMPT_PREFIX2=":%{$fg[cyan]%}" +YS_VCS_PROMPT_SUFFIX="%{$reset_color%}" +YS_VCS_PROMPT_DIRTY=" %{$fg[red]%}x" +YS_VCS_PROMPT_CLEAN=" %{$fg[green]%}o" + +# Git info +local git_info='$(git_prompt_info)' +ZSH_THEME_GIT_PROMPT_PREFIX="${YS_VCS_PROMPT_PREFIX1}git${YS_VCS_PROMPT_PREFIX2}" +ZSH_THEME_GIT_PROMPT_SUFFIX="$YS_VCS_PROMPT_SUFFIX" +ZSH_THEME_GIT_PROMPT_DIRTY="$YS_VCS_PROMPT_DIRTY" +ZSH_THEME_GIT_PROMPT_CLEAN="$YS_VCS_PROMPT_CLEAN" + +# HG info +local hg_info='$(ys_hg_prompt_info)' +ys_hg_prompt_info() { + # make sure this is a hg dir + if [ -d '.hg' ]; then + echo -n "${YS_VCS_PROMPT_PREFIX1}hg${YS_VCS_PROMPT_PREFIX2}" + echo -n $(hg branch 2>/dev/null) + if [ -n "$(hg status 2>/dev/null)" ]; then + echo -n "$YS_VCS_PROMPT_DIRTY" + else + echo -n "$YS_VCS_PROMPT_CLEAN" + fi + echo -n "$YS_VCS_PROMPT_SUFFIX" + fi +} + +local exit_code="%(?,,C:%{$fg[red]%}%?%{$reset_color%} )" + +### BEGIN: pepoluan changes ### +local dgrey="$terminfo[bold]$fg[black]" + +# Local need: Show the GCE_PROJECT var +local gce_env="%{\${GCE_PROJECT:+$fg[yellow] GCE:}\$GCE_PROJECT$reset_color%}" + +# Show my IP Address +yspep_my_ip() { + echo $(ip -o addr show | awk -v atype=${1:-inet} '$2 != "lo" && $3 == atype {gsub(/\/[0-9]+/, "", $4); print $4}') +} +local ip_info='$(yspep_my_ip)' + +# Show Virtualenv +ZSH_THEME_VIRTUALENV_PREFIX=" V:" +ZSH_THEME_VIRTUALENV_SUFFIX=" " +local venv_info="%{$terminfo[bold]$fg[blue]\$(virtualenv_prompt_info)$reset_color%}" + +# Prompt format: +# +# PRIVILEGES USER @ MACHINE in DIRECTORY on git:BRANCH STATE [TIME] C:LAST_EXIT_CODE V:VIRTUALENV +# $ COMMAND +# +# For example: +# +# % ys @ ys-mbp in ~/.oh-my-zsh on git:master x [21:47:42] C:0 +# $ +PROMPT=" +%{$dgrey%}[%*]%{$reset_color%} \ +%(#,%{$bg[yellow]%}%{$fg[black]%}%n%{$reset_color%},%{$fg[cyan]%}%n)\ +%{$fg[white]%}@%{$fg[green]%}%m\ +%{$dgrey%}[%{$fg[green]%}$ip_info%{$dgrey%}]::%{$reset_color%}\ +%{$terminfo[bold]$fg[yellow]%}%~%{$reset_color%}\ +${hg_info}\ +${git_info}\ + $exit_code$gce_env$venv_info +%{$terminfo[bold]$fg[red]%}$ %{$reset_color%}" + +unset RPROMPT + diff --git a/themes/ys-pep.zsh-theme.orig b/themes/ys-pep.zsh-theme.orig new file mode 100644 index 000000000..aa091bb8d --- /dev/null +++ b/themes/ys-pep.zsh-theme.orig @@ -0,0 +1,79 @@ +# Clean, simple, compatible and meaningful. +# Tested on Linux, Unix and Windows under ANSI colors. +# It is recommended to use with a dark background. +# Colors: black, red, green, yellow, *blue, magenta, cyan, and white. +# +# Mar 2013 Yad Smood + +# VCS +YS_VCS_PROMPT_PREFIX1=" %{$fg[white]%}on%{$reset_color%} " +YS_VCS_PROMPT_PREFIX2=":%{$fg[cyan]%}" +YS_VCS_PROMPT_SUFFIX="%{$reset_color%}" +YS_VCS_PROMPT_DIRTY=" %{$fg[red]%}x" +YS_VCS_PROMPT_CLEAN=" %{$fg[green]%}o" + +# Git info +local git_info='$(git_prompt_info)' +ZSH_THEME_GIT_PROMPT_PREFIX="${YS_VCS_PROMPT_PREFIX1}git${YS_VCS_PROMPT_PREFIX2}" +ZSH_THEME_GIT_PROMPT_SUFFIX="$YS_VCS_PROMPT_SUFFIX" +ZSH_THEME_GIT_PROMPT_DIRTY="$YS_VCS_PROMPT_DIRTY" +ZSH_THEME_GIT_PROMPT_CLEAN="$YS_VCS_PROMPT_CLEAN" + +# HG info +local hg_info='$(ys_hg_prompt_info)' +ys_hg_prompt_info() { + # make sure this is a hg dir + if [ -d '.hg' ]; then + echo -n "${YS_VCS_PROMPT_PREFIX1}hg${YS_VCS_PROMPT_PREFIX2}" + echo -n $(hg branch 2>/dev/null) + if [ -n "$(hg status 2>/dev/null)" ]; then + echo -n "$YS_VCS_PROMPT_DIRTY" + else + echo -n "$YS_VCS_PROMPT_CLEAN" + fi + echo -n "$YS_VCS_PROMPT_SUFFIX" + fi +} + +local exit_code="%(?,,C:%{$fg[red]%}%?%{$reset_color%} )" + +### BEGIN: pepoluan changes ### + +# Local need: Show the GCE_PROJECT var +local gce_env="%{\${GCE_PROJECT:+$fg[yellow]GCE:}\$GCE_PROJECT$reset_color%}" + +# Show my IP Address +yspep_my_ip() { + echo $(ip -o addr show | awk -v atype=${1:-inet} '$2 != "lo" && $3 == atype {gsub(/\/[0-9]+/, "", $4); print $4}') +} +local ip_info='$(yspep_my_ip)' + +# Show Virtualenv +ZSH_THEME_VIRTUALENV_PREFIX=" V:" +ZSH_THEME_VIRTUALENV_SUFFIX=" " +local venv_info="%{$terminfo[bold]$fg[blue]\$(virtualenv_prompt_info)$reset_color%}" + +# Prompt format: +# +# PRIVILEGES USER @ MACHINE in DIRECTORY on git:BRANCH STATE [TIME] C:LAST_EXIT_CODE V:VIRTUALENV +# $ COMMAND +# +# For example: +# +# % ys @ ys-mbp in ~/.oh-my-zsh on git:master x [21:47:42] C:0 +# $ +PROMPT=" +%{$terminfo[bold]$fg[blue]%}#%{$reset_color%} \ +%(#,%{$bg[yellow]%}%{$fg[black]%}%n%{$reset_color%},%{$fg[cyan]%}%n)\ +%{$fg[white]%}@%{$fg[green]%}%m\ +%{$fg[white]%}[%{$fg[green]%}$ip_info\ +%{$fg[white]%}]::\ +%{$terminfo[bold]$fg[yellow]%}%~%{$reset_color%}\ +${hg_info}\ +${git_info}\ + \ +%{$fg[white]%}[%*] $exit_code$gce_env$venv_info +%{$terminfo[bold]$fg[red]%}$ %{$reset_color%}" + +unset RPROMPT +