From 8facbcd45e39fd848fde43a73bba55b491ac13b7 Mon Sep 17 00:00:00 2001 From: Joseph Tannhuber Date: Wed, 28 May 2014 15:16:13 +0200 Subject: [PATCH] New theme: budspencer. Added: username and hostname. --- .../prompt/functions/prompt_budspencer_setup | 118 ++++++++++++++++++ .../prompt/functions/prompt_dangerous_setup | 43 ++++--- .../prompt/functions/prompt_terencehill_setup | 69 +++++----- 3 files changed, 185 insertions(+), 45 deletions(-) create mode 100644 modules/prompt/functions/prompt_budspencer_setup diff --git a/modules/prompt/functions/prompt_budspencer_setup b/modules/prompt/functions/prompt_budspencer_setup new file mode 100644 index 00000000..c45eb52b --- /dev/null +++ b/modules/prompt/functions/prompt_budspencer_setup @@ -0,0 +1,118 @@ +################################################## +# vim: ft=zsh +# +# A simple theme that displays relevant, contextual information. +# +# Authors: +# Joseph Tannhuber +################################################## + +# Load dependencies. +pmodload 'helper' + +function prompt_budspencer_user { +unset _prompt_budspencer_user +if [[ -n "$SSH_CLIENT" || $UID -eq 0 ]]; then + _prompt_budspencer_user="%(!.%{%K{166}%B%}.)%n" +fi +} + +function prompt_budspencer_pwd { +local pwd="${PWD/#$HOME/~}" +unset _prompt_budspencer_pwd +if [[ -n "$SSH_CLIENT" || $UID -eq 0 ]]; then + _prompt_budspencer_pwd="@%M:" +fi +if [[ "$pwd" == (#m)[/~] ]]; then + _prompt_budspencer_pwd+="$MATCH" + unset MATCH +else + _prompt_budspencer_pwd+="${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}/${pwd:t}" +fi +} + +function prompt_budspencer_indicator { +if [[ "$editor_info[vimode]" =~ "red" ]]; then + print -n "%{\033]12;#dc322f\007%K{$editor_info[vimode]}%} REPLACE " +else + if [[ "$editor_info[vimode]" =~ "blue" ]]; then + print -n "%{\033]12;#268bd2\007%K{$editor_info[vimode]}%} NORMAL " + else + print -n "%{\033]12;#b58900\007%K{$editor_info[vimode]}%} INSERT " + fi +fi +} + +function prompt_budspencer_symbols { +_prompt_budspencer_symbols="${VIM:+" %B%F{green}V%f%b"}" +_prompt_budspencer_symbols+="${jobstates:+" %F{cyan}⚙%f"}" +_prompt_budspencer_symbols+="%(?::%B%F{red} ⏎%f%b)" +_prompt_budspencer_symbols+="%f%(!. %B%F{166}⚡%f%b.)" +} + +function prompt_budspencer_precmd { +setopt LOCAL_OPTIONS +unsetopt XTRACE KSH_ARRAYS + +# Format Username. +prompt_budspencer_user + +# Format PWD. +prompt_budspencer_pwd + +# Format Symbols. +prompt_budspencer_symbols + +# Get Git repository information. +if (( $+functions[git-info] )); then + git-info +fi + +# Removes the whitespace character at the end of the right prompt. +ZLE_RPROMPT_INDENT=0 +} + +function prompt_budspencer_setup { +setopt LOCAL_OPTIONS +unsetopt XTRACE KSH_ARRAYS +prompt_opts=(cr percent subst) + +# Load required functions. +autoload -Uz add-zsh-hook + +# Add hook for calling git-info before each command. +add-zsh-hook precmd prompt_budspencer_precmd + +# Set editor-info parameters. +zstyle ':prezto:module:editor:info:completing' format '%B%F{red}...%f%b' +zstyle ':prezto:module:editor:info:keymap:primary' format 'yellow' +zstyle ':prezto:module:editor:info:keymap:primary:insert' format 'yellow' +zstyle ':prezto:module:editor:info:keymap:primary:overwrite' format 'red' +zstyle ':prezto:module:editor:info:keymap:alternate' format 'blue' + +# Set git-info parameters. +zstyle ':prezto:module:git:info' verbose 'yes' +zstyle ':prezto:module:git:info:action' format ':%%B%F{violet}%s%f%%b' +zstyle ':prezto:module:git:info:added' format ' %%B%F{green}✚%f%%b' +zstyle ':prezto:module:git:info:ahead' format ' %%B%F{violet}⬆%f%%b' +zstyle ':prezto:module:git:info:behind' format ' %%B%F{violet}⬇%f%%b' +zstyle ':prezto:module:git:info:branch' format '%K{241}%F{black}%b' +zstyle ':prezto:module:git:info:commit' format ':%F{green}%.7c%f' +zstyle ':prezto:module:git:info:deleted' format ' %%B%F{red}✖%f%%b' +zstyle ':prezto:module:git:info:modified' format ' %%B%F{blue}✱%f%%b' +zstyle ':prezto:module:git:info:position' format ':%F{red}%p%f' +zstyle ':prezto:module:git:info:renamed' format ' %%B%F{magenta}➜%f%%b' +zstyle ':prezto:module:git:info:stashed' format ' %%B%F{cyan}✭%f%%b' +zstyle ':prezto:module:git:info:unmerged' format ' %%B%F{violet}═%f%%b' +zstyle ':prezto:module:git:info:untracked' format ' %%B%F{white}◼%f%%b' +zstyle ':prezto:module:git:info:keys' format \ + 'prompt' '%F{$editor_info{vimode]}%K{241}%F{black} %f $(coalesce "%b" "%p" "%c")%s %F{241}' \ + 'rprompt' '%A%B%S%a%d%m%r%U%u' + +# Define prompts. +PROMPT='%F{black}$(prompt_budspencer_indicator)%F{${editor_info[vimode]}}%k${git_info:+${(e)git_info[prompt]}}%k%f${_prompt_budspencer_symbols} ' +RPROMPT='${git_info[rprompt]} %K{black}%F{${editor_info[vimode]}}%F{black}%K{${editor_info[vimode]}} ${_prompt_budspencer_user}%K{${editor_info[vimode]}}${_prompt_budspencer_pwd} ' +SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? ' +} + +prompt_budspencer_setup "$@" diff --git a/modules/prompt/functions/prompt_dangerous_setup b/modules/prompt/functions/prompt_dangerous_setup index 533d4157..e2aed43c 100644 --- a/modules/prompt/functions/prompt_dangerous_setup +++ b/modules/prompt/functions/prompt_dangerous_setup @@ -5,34 +5,41 @@ # # Authors: # Joseph Tannhuber -# -# Screenshots: -# http://i.imgur.com/nBEEZ.png ################################################## # Load dependencies. pmodload 'helper' +function prompt_dangerous_user { +unset _prompt_dangerous_user +if [[ -n "$SSH_CLIENT" || $UID -eq 0 ]]; then + _prompt_dangerous_user="%(!.%{%F{166}%B%}.)%n" +fi +} + function prompt_dangerous_pwd { local pwd="${PWD/#$HOME/~}" - +unset _prompt_dangerous_pwd +if [[ -n "$SSH_CLIENT" || $UID -eq 0 ]]; then + _prompt_dangerous_pwd="@%M:" +fi if [[ "$pwd" == (#m)[/~] ]]; then - _prompt_dangerous_pwd="$MATCH" + _prompt_dangerous_pwd+="$MATCH" unset MATCH else - _prompt_dangerous_pwd="${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}/${pwd:t}" + _prompt_dangerous_pwd+="${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}/${pwd:t}" fi } function prompt_dangerous_indicator { -if [[ "$editor_info" =~ "red" ]]; then - print -n "\033]12;#dc322f\007$editor_info[overwrite]" -fi -if [[ "$editor_info" =~ "blue" ]]; then - print -n "\033]12;#268bd2\007$editor_info[keymap]" -fi -if [[ ! "$editor_info" =~ "blue" && ! "$editor_info" =~ "red" ]]; then - print -n "\033]12;#b58900\007$editor_info[keymap]" +if [[ "$editor_info[vimode]" =~ "red" ]]; then + print -n "\033]12;#dc322f\007" +else + if [[ "$editor_info[vimode]" =~ "blue" ]]; then + print -n "\033]12;#268bd2\007" + else + print -n "\033]12;#b58900\007" + fi fi } @@ -47,6 +54,9 @@ function prompt_dangerous_precmd { setopt LOCAL_OPTIONS unsetopt XTRACE KSH_ARRAYS +# Format Username. +prompt_dangerous_user + # Format PWD. prompt_dangerous_pwd @@ -76,6 +86,7 @@ add-zsh-hook precmd prompt_dangerous_precmd # Set editor-info parameters. zstyle ':prezto:module:editor:info:completing' format '%B%F{red}...%f%b' zstyle ':prezto:module:editor:info:keymap:primary' format '%B%F{yellow}' +zstyle ':prezto:module:editor:info:keymap:primary:insert' format '%B%F{yellow}' zstyle ':prezto:module:editor:info:keymap:primary:overwrite' format '%B%F{red}' zstyle ':prezto:module:editor:info:keymap:alternate' format '%B%F{blue}' @@ -99,8 +110,8 @@ zstyle ':prezto:module:git:info:keys' format \ 'rprompt' '%A%B%S%a%d%m%r%U%u' # Define prompts. -PROMPT='%{$(prompt_dangerous_indicator)%}❯❯❯%b${git_info:+${(e)git_info[prompt]} %B❯❯❯%b}${_prompt_dangerous_symbols} ' -RPROMPT='${git_info[rprompt]} %B❮❮❮%b ${_prompt_dangerous_pwd} ${editor_info[keymap]}${editor_info[overwrite]}❮❮❮' +PROMPT='${editor_info[vimode]}❯❯❯%b%f${git_info:+${(e)git_info[prompt]} %B❯❯❯%b}${_prompt_dangerous_symbols} ' +RPROMPT='${git_info[rprompt]} %B❮❮❮%b ${_prompt_dangerous_user}%b${_prompt_dangerous_pwd} ${editor_info[vimode]}❮❮❮%{$(prompt_dangerous_indicator)%}' SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? ' } diff --git a/modules/prompt/functions/prompt_terencehill_setup b/modules/prompt/functions/prompt_terencehill_setup index cddae881..d933fbc1 100644 --- a/modules/prompt/functions/prompt_terencehill_setup +++ b/modules/prompt/functions/prompt_terencehill_setup @@ -5,53 +5,63 @@ # # Authors: # Joseph Tannhuber -# -# Screenshots: -# http://i.imgur.com/nBEEZ.png ################################################## # Load dependencies. pmodload 'helper' -function prompt_dangerous_pwd { -local pwd="${PWD/#$HOME/~}" +function prompt_terencehill_user { +unset _prompt_terencehill_user +if [[ -n "$SSH_CLIENT" || $UID -eq 0 ]]; then + _prompt_terencehill_user="%(!.%{%F{166}%B%}.)%n" +fi +} +function prompt_terencehill_pwd { +local pwd="${PWD/#$HOME/~}" +unset _prompt_terencehill_pwd +if [[ -n "$SSH_CLIENT" || $UID -eq 0 ]]; then + _prompt_terencehill_pwd="@%M:" +fi if [[ "$pwd" == (#m)[/~] ]]; then - _prompt_dangerous_pwd="$MATCH" + _prompt_terencehill_pwd+="$MATCH" unset MATCH else - _prompt_dangerous_pwd="${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}/${pwd:t}" + _prompt_terencehill_pwd+="${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}/${pwd:t}" fi } -function prompt_dangerous_indicator { -if [[ "$editor_info" =~ "red" ]]; then - print -n "%{\033]12;#dc322f\007$editor_info[overwrite]%}REPLACE" -fi -if [[ "$editor_info" =~ "blue" ]]; then - print -n "%{\033]12;#268bd2\007$editor_info[keymap]%}NORMAL" -fi -if [[ ! "$editor_info" =~ "blue" && ! "$editor_info" =~ "red" ]]; then - print -n "%{\033]12;#b58900\007$editor_info[keymap]%}INSERT" +function prompt_terencehill_indicator { +if [[ "${editor_info[vimode]}" =~ "red" ]]; then + print -n "%{\033]12;#dc322f\007${editor_info[vimode]}%}REPLACE" +else + if [[ "${editor_info[vimode]}" =~ "blue" ]]; then + print -n "%{\033]12;#268bd2\007${editor_info[vimode]}%}NORMAL" + else + print -n "%{\033]12;#b58900\007${editor_info[vimode]}%}INSERT" + fi fi } -function prompt_dangerous_symbols { -_prompt_dangerous_symbols="${VIM:+" %B%F{green}V%f%b"}" -_prompt_dangerous_symbols+="${jobstates:+" %F{cyan}⚙%f"}" -_prompt_dangerous_symbols+="%(?::%B%F{red} ⏎%f%b)" -_prompt_dangerous_symbols+="%f%(!. %B%F{166}⚡%f%b.)" +function prompt_terencehill_symbols { +_prompt_terencehill_symbols="${VIM:+" %B%F{green}V%f%b"}" +_prompt_terencehill_symbols+="${jobstates:+" %F{cyan}⚙%f"}" +_prompt_terencehill_symbols+="%(?::%B%F{red} ⏎%f%b)" +_prompt_terencehill_symbols+="%f%(!. %B%F{166}⚡%f%b.)" } -function prompt_dangerous_precmd { +function prompt_terencehill_precmd { setopt LOCAL_OPTIONS unsetopt XTRACE KSH_ARRAYS +# Format Username. +prompt_terencehill_user + # Format PWD. -prompt_dangerous_pwd +prompt_terencehill_pwd # Format Symbols. -prompt_dangerous_symbols +prompt_terencehill_symbols # Get Git repository information. if (( $+functions[git-info] )); then @@ -62,7 +72,7 @@ fi ZLE_RPROMPT_INDENT=0 } -function prompt_dangerous_setup { +function prompt_terencehill_setup { setopt LOCAL_OPTIONS unsetopt XTRACE KSH_ARRAYS prompt_opts=(cr percent subst) @@ -71,11 +81,12 @@ prompt_opts=(cr percent subst) autoload -Uz add-zsh-hook # Add hook for calling git-info before each command. -add-zsh-hook precmd prompt_dangerous_precmd +add-zsh-hook precmd prompt_terencehill_precmd # Set editor-info parameters. zstyle ':prezto:module:editor:info:completing' format '%B%F{red}...%f%b' zstyle ':prezto:module:editor:info:keymap:primary' format '%F{yellow}' +zstyle ':prezto:module:editor:info:keymap:primary:insert' format '%F{yellow}' zstyle ':prezto:module:editor:info:keymap:primary:overwrite' format '%F{red}' zstyle ':prezto:module:editor:info:keymap:alternate' format '%F{blue}' @@ -99,9 +110,9 @@ zstyle ':prezto:module:git:info:keys' format \ 'rprompt' '%A%B%S%a%d%m%r%U%u' # Define prompts. -PROMPT='$(prompt_dangerous_indicator) ▷%b${git_info:+${(e)git_info[prompt]} ▷}${_prompt_dangerous_symbols} ' -RPROMPT='${git_info[rprompt]} ${editor_info[keymap]}${editor_info[overwrite]}◁ ${_prompt_dangerous_pwd}' +PROMPT='$(prompt_terencehill_indicator) ▷${git_info:+${(e)git_info[prompt]} ▷}${_prompt_terencehill_symbols} ' +RPROMPT='${git_info[rprompt]} ${editor_info[vimode]}◁ ${_prompt_terencehill_user}%b${editor_info[vimode]}${_prompt_terencehill_pwd}' SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? ' } -prompt_dangerous_setup "$@" +prompt_terencehill_setup "$@"