Converted theme to promptinit variant
This commit is contained in:
PatTheMav
parent
d9a75941c7
commit
feb3e4d3d9
1 changed files with 85 additions and 90 deletions
|
|
@ -4,69 +4,51 @@
|
|||
#
|
||||
# Requires the `git-info` zmodule to be included in the .zimrc file.
|
||||
|
||||
# Switches
|
||||
MINIMAL_PROMPT="${MINIMAL_PROMPT:-yes}"
|
||||
MINIMAL_RPROMPT="${MINIMAL_RPROMPT:-yes}"
|
||||
MINIMAL_MAGIC_ENTER="${MINIMAL_MAGIC_ENTER:-yes}"
|
||||
MINIMAL_SSH_HOSTNAME="${MINIMAL_SSH_HOSTNAME:-yes}"
|
||||
function {
|
||||
# Switches
|
||||
MINIMAL_PROMPT="${MINIMAL_PROMPT:-yes}"
|
||||
MINIMAL_RPROMPT="${MINIMAL_RPROMPT:-yes}"
|
||||
MINIMAL_MAGIC_ENTER="${MINIMAL_MAGIC_ENTER:-yes}"
|
||||
MINIMAL_SSH_HOSTNAME="${MINIMAL_SSH_HOSTNAME:-yes}"
|
||||
|
||||
# Parameters
|
||||
MINIMAL_OK_COLOR="${MINIMAL_OK_COLOR:-2}"
|
||||
MINIMAL_USER_CHAR="${MINIMAL_USER_CHAR:-λ}"
|
||||
MINIMAL_INSERT_CHAR="${MINIMAL_INSERT_CHAR:-›}"
|
||||
MINIMAL_NORMAL_CHAR="${MINIMAL_NORMAL_CHAR:-·}"
|
||||
MINIMAL_PWD_LEN="${MINIMAL_PWD_LEN:-2}"
|
||||
MINIMAL_PWD_CHAR_LEN="${MINIMAL_PWD_CHAR_LEN:-10}"
|
||||
MINIMAL_MAGIC_ENTER_MARGIN="${MINIMAL_MAGIC_ENTER_MARGIN:- | }"
|
||||
|
||||
# check if function exists
|
||||
function _isfn {
|
||||
type -w "$1" | grep -wq function
|
||||
# Parameters
|
||||
MINIMAL_OK_COLOR="${MINIMAL_OK_COLOR:-2}"
|
||||
MINIMAL_USER_CHAR="${MINIMAL_USER_CHAR:-λ}"
|
||||
MINIMAL_INSERT_CHAR="${MINIMAL_INSERT_CHAR:-›}"
|
||||
MINIMAL_NORMAL_CHAR="${MINIMAL_NORMAL_CHAR:-·}"
|
||||
MINIMAL_PWD_LEN="${MINIMAL_PWD_LEN:-2}"
|
||||
MINIMAL_PWD_CHAR_LEN="${MINIMAL_PWD_CHAR_LEN:-10}"
|
||||
MINIMAL_MAGIC_ENTER_MARGIN="${MINIMAL_MAGIC_ENTER_MARGIN:- | }"
|
||||
}
|
||||
|
||||
# Extensions
|
||||
if ! _isfn minimal_magic_output; then
|
||||
function minimal_magic_output {
|
||||
minimal_magic_output_base
|
||||
}
|
||||
fi
|
||||
function prompt_minimal2_magic_output {
|
||||
prompt_minimal2_magic_output_base
|
||||
}
|
||||
|
||||
if ! _isfn minimal_vcs; then
|
||||
function minimal_vcs {
|
||||
# git
|
||||
if [[ -n ${git_info} ]]; then
|
||||
print -n " ${(e)git_info[color]}${(e)git_info[prompt]}%{\e[0m%}"
|
||||
fi
|
||||
}
|
||||
fi
|
||||
function prompt_minimal2_vcs {
|
||||
# git
|
||||
if [[ -n ${git_info} ]]; then
|
||||
echo -n " ${(e)git_info[color]}${(e)git_info[prompt]}%{\e[0m%}"
|
||||
fi
|
||||
}
|
||||
|
||||
if ! _isfn minimal_env; then
|
||||
function minimal_env {
|
||||
# python virtual env
|
||||
if [ -n "$VIRTUAL_ENV" ]; then
|
||||
_venv="$(basename $VIRTUAL_ENV)"
|
||||
echo -n "${_venv%%.*} "
|
||||
fi
|
||||
}
|
||||
fi
|
||||
function prompt_minimal2_env {
|
||||
# python virtual env
|
||||
if [ -n "$VIRTUAL_ENV" ]; then
|
||||
_venv="$(basename $VIRTUAL_ENV)"
|
||||
echo -n "${_venv%%.*} "
|
||||
fi
|
||||
}
|
||||
|
||||
if ! _isfn minimal_ssh_hostname; then
|
||||
function minimal_ssh_hostname {
|
||||
if [[ "${MINIMAL_SSH_HOSTNAME}" == "yes" ]] && ([[ -n "$SSH_CLIENT" ]] || [[ -n "$SSH_TTY" ]]); then
|
||||
echo "$(hostname -s) "
|
||||
fi
|
||||
}
|
||||
fi
|
||||
|
||||
# Setup
|
||||
autoload -U colors && colors
|
||||
setopt prompt_subst
|
||||
|
||||
_grey="\e[38;5;244m"
|
||||
_greyp="%{$_grey%}"
|
||||
function prompt_minimal2_ssh_hostname {
|
||||
if [[ "${MINIMAL_SSH_HOSTNAME}" == "yes" ]] && ([[ -n "$SSH_CLIENT" ]] || [[ -n "$SSH_TTY" ]]); then
|
||||
echo -n "$(hostname -s) "
|
||||
fi
|
||||
}
|
||||
|
||||
# Left Prompt
|
||||
function minimal_lprompt {
|
||||
function prompt_minimal2_lprompt {
|
||||
local user_status="%{\e[%(1j.4.0);3%(0?.$MINIMAL_OK_COLOR.1)m%}\
|
||||
%(!.#.$MINIMAL_USER_CHAR)"
|
||||
local kmstatus="$MINIMAL_INSERT_CHAR"
|
||||
|
|
@ -75,7 +57,7 @@ function minimal_lprompt {
|
|||
echo -n "$user_status%{\e[0m%} $kmstatus"
|
||||
}
|
||||
|
||||
function minimal_ps2 {
|
||||
function prompt_minimal2_ps2 {
|
||||
local kmstatus="$MINIMAL_INSERT_CHAR"
|
||||
local offset="$((${#_venv} + 2))"
|
||||
[ "$KEYMAP" = 'vicmd' ] && kmstatus="$MINIMAL_NORMAL_CHAR"
|
||||
|
|
@ -85,7 +67,7 @@ function minimal_ps2 {
|
|||
}
|
||||
|
||||
# Right Prompt
|
||||
function minimal_path {
|
||||
function prompt_minimal2_path {
|
||||
local w="%{\e[0m%}"
|
||||
local cwd="%${MINIMAL_PWD_LEN}~"
|
||||
local pi=""
|
||||
|
|
@ -104,7 +86,7 @@ function minimal_path {
|
|||
}
|
||||
|
||||
# Magic Enter
|
||||
function minimal_infoline {
|
||||
function prompt_minimal2_infoline {
|
||||
local last_err="$1"
|
||||
local w="\e[0m"
|
||||
local rn="\e[0;31m"
|
||||
|
|
@ -128,7 +110,7 @@ function minimal_infoline {
|
|||
echo "$iline"
|
||||
}
|
||||
|
||||
function minimal_magic_output_base {
|
||||
function prompt_minimal2_magic_output_base {
|
||||
local margin="${#MINIMAL_MAGIC_ENTER_MARGIN}"
|
||||
|
||||
if [ "$(dirs -p | wc -l)" -gt 1 ]; then
|
||||
|
|
@ -145,7 +127,7 @@ function minimal_magic_output_base {
|
|||
git -c color.status=always status -sb 2> /dev/null
|
||||
}
|
||||
|
||||
function minimal_wrap_output {
|
||||
function prompt_minimal2_wrap_output {
|
||||
local output="$1"
|
||||
local output_len="$(echo "$output" | sed -n '$=')"
|
||||
if [ -n "$output" ]; then
|
||||
|
|
@ -157,51 +139,64 @@ function minimal_wrap_output {
|
|||
fi
|
||||
}
|
||||
|
||||
function minimal_magic_enter {
|
||||
function prompt_minimal2_magic_enter {
|
||||
local last_err="$?" # I need to capture this ASAP
|
||||
|
||||
if [ -z "$BUFFER" ]; then
|
||||
minimal_infoline $last_err
|
||||
minimal_wrap_output "$(minimal_magic_output)"
|
||||
prompt_minimal2_infoline $last_err
|
||||
prompt_minimal2_wrap_output "$(prompt_minimal2_magic_output)"
|
||||
zle redisplay
|
||||
else
|
||||
zle accept-line
|
||||
fi
|
||||
}
|
||||
|
||||
prompt_minimal_precmd() {
|
||||
prompt_minimal2_precmd() {
|
||||
(( ${+functions[git-info]} )) && git-info
|
||||
}
|
||||
|
||||
# Apply Switches
|
||||
if [ "$MINIMAL_PROMPT" = "yes" ]; then
|
||||
# prompt redraw on vimode change
|
||||
function reset_prompt {
|
||||
zle reset-prompt
|
||||
}
|
||||
prompt_minimal2_setup() {
|
||||
# Setup
|
||||
autoload -Uz colors && colors
|
||||
autoload -Uz add-zsh-hook
|
||||
|
||||
zle -N zle-line-init reset_prompt
|
||||
zle -N zle-keymap-select reset_prompt
|
||||
_grey="\e[38;5;244m"
|
||||
_greyp="%{$_grey%}"
|
||||
|
||||
add-zsh-hook precmd prompt_minimal_precmd
|
||||
# Apply Switches
|
||||
if [ "$MINIMAL_PROMPT" = "yes" ]; then
|
||||
# prompt redraw on vimode change
|
||||
function reset_prompt {
|
||||
zle reset-prompt
|
||||
}
|
||||
|
||||
zstyle ':zim:git-info:branch' format '%b'
|
||||
zstyle ':zim:git-info:commit' format '%c'
|
||||
zstyle ':zim:git-info:dirty' format '%{\e[0;31m%}'
|
||||
zstyle ':zim:git-info:diverged' format '%{\e[0;31m%}'
|
||||
zstyle ':zim:git-info:behind' format '%F{11}'
|
||||
zstyle ':zim:git-info:ahead' format '%f'
|
||||
zstyle ':zim:git-info:keys' format \
|
||||
'prompt' '%b%c' \
|
||||
'color' '$(coalesce "%D" "%V" "%B" "%A" "%{\e[0;3${MINIMAL_OK_COLOR}m%}")'
|
||||
prompt_opts=(cr percent sp subst)
|
||||
|
||||
PROMPT='$(minimal_env)$(minimal_ssh_hostname)$(minimal_lprompt) '
|
||||
PS2='$(minimal_ps2) '
|
||||
[ "$MINIMAL_RPROMPT" = "yes" ] && RPROMPT='$(minimal_path)$(minimal_vcs)'
|
||||
fi
|
||||
zle -N zle-line-init reset_prompt
|
||||
zle -N zle-keymap-select reset_prompt
|
||||
|
||||
if [ "$MINIMAL_MAGIC_ENTER" = "yes" ]; then
|
||||
zle -N minimal-magic-enter minimal_magic_enter
|
||||
bindkey -M main "^M" minimal-magic-enter
|
||||
bindkey -M vicmd "^M" minimal-magic-enter
|
||||
fi
|
||||
add-zsh-hook precmd prompt_minimal2_precmd
|
||||
|
||||
zstyle ':zim:git-info:branch' format '%b'
|
||||
zstyle ':zim:git-info:commit' format '%c'
|
||||
zstyle ':zim:git-info:dirty' format '%{\e[0;31m%}'
|
||||
zstyle ':zim:git-info:diverged' format '%{\e[0;31m%}'
|
||||
zstyle ':zim:git-info:behind' format '%F{11}'
|
||||
zstyle ':zim:git-info:ahead' format '%f'
|
||||
zstyle ':zim:git-info:keys' format \
|
||||
'prompt' '%b%c' \
|
||||
'color' '$(coalesce "%D" "%V" "%B" "%A" "%{\e[0;3${MINIMAL_OK_COLOR}m%}")'
|
||||
|
||||
PROMPT='$(prompt_minimal2_env)$(prompt_minimal2_ssh_hostname)$(prompt_minimal2_lprompt) '
|
||||
PS2='$(prompt_minimal2_ps2) '
|
||||
[ "$MINIMAL_RPROMPT" = "yes" ] && RPROMPT='$(prompt_minimal2_path)$(prompt_minimal2_vcs)'
|
||||
fi
|
||||
|
||||
if [ "$MINIMAL_MAGIC_ENTER" = "yes" ]; then
|
||||
zle -N prompt_minimal2-magic-enter prompt_minimal2_magic_enter
|
||||
bindkey -M main "^M" prompt_minimal2-magic-enter
|
||||
bindkey -M vicmd "^M" prompt_minimal2-magic-enter
|
||||
fi
|
||||
}
|
||||
|
||||
prompt_minimal2_setup "$@"
|
||||
Loading…
Reference in a new issue