Merge remote-tracking branch 'upstream/next' into next
This commit is contained in:
rjorgenson
commit
6ed6ba876e
8 changed files with 533 additions and 228 deletions
|
|
@ -20,43 +20,44 @@
|
|||
#zstyle ':vcs_info:*+*:*' debug true
|
||||
#set -o xtrace
|
||||
|
||||
# Check if the theme was called as a function (e.g., from prezto)
|
||||
if [[ $(whence -w prompt_powerlevel9k_setup) =~ "function" ]]; then
|
||||
# Try to set the installation path
|
||||
if [[ -n "$POWERLEVEL9K_INSTALLATION_PATH" ]]; then
|
||||
# If an installation path was set manually,
|
||||
# it should trump any other location found.
|
||||
# Do nothing. This is all right, as we use the
|
||||
# POWERLEVEL9K_INSTALLATION_PATH for further processing.
|
||||
elif [[ $(whence -w prompt_powerlevel9k_setup) =~ "function" ]]; then
|
||||
# Check if the theme was called as a function (e.g., from prezto)
|
||||
autoload -U is-at-least
|
||||
if is-at-least 5.0.8; then
|
||||
# Try to find the correct path of the script.
|
||||
0=$(whence -v $0 | sed "s/$0 is a shell function from //")
|
||||
POWERLEVEL9K_INSTALLATION_PATH=$(whence -v $0 | sed "s/$0 is a shell function from //")
|
||||
elif [[ -f "${ZDOTDIR:-$HOME}/.zprezto/modules/prompt/init.zsh" ]]; then
|
||||
# If there is an prezto installation, we assume that powerlevel9k is linked there.
|
||||
0="${ZDOTDIR:-$HOME}/.zprezto/modules/prompt/functions/prompt_powerlevel9k_setup"
|
||||
else
|
||||
# Fallback: specify an installation path!
|
||||
if [[ -z "$POWERLEVEL9K_INSTALLATION_PATH" ]]; then
|
||||
print -P "%F{red}We could not locate the installation path of powerlevel9k.%f"
|
||||
print -P "Please specify by setting %F{blue}POWERLEVEL9K_INSTALLATION_PATH%f (full path incl. file name) at the very beginning of your ~/.zshrc"
|
||||
return 1
|
||||
elif [[ -L "$POWERLEVEL9K_INSTALLATION_PATH" ]]; then
|
||||
# Symlink
|
||||
0="$POWERLEVEL9K_INSTALLATION_PATH"
|
||||
elif [[ -f "$POWERLEVEL9K_INSTALLATION_PATH" ]]; then
|
||||
# File
|
||||
0="$POWERLEVEL9K_INSTALLATION_PATH"
|
||||
elif [[ -d "$POWERLEVEL9K_INSTALLATION_PATH" ]]; then
|
||||
# Directory
|
||||
0="${POWERLEVEL9K_INSTALLATION_PATH}/powerlevel9k.zsh-theme"
|
||||
fi
|
||||
POWERLEVEL9K_INSTALLATION_PATH="${ZDOTDIR:-$HOME}/.zprezto/modules/prompt/functions/prompt_powerlevel9k_setup"
|
||||
fi
|
||||
else
|
||||
# Last resort: Set installation path is script path
|
||||
POWERLEVEL9K_INSTALLATION_PATH="$0"
|
||||
fi
|
||||
|
||||
# If this theme is sourced as a symlink, we need to locate the true URL
|
||||
if [[ -L $0 ]]; then
|
||||
# Script is a symlink
|
||||
filename="$(realpath -P $0 2>/dev/null || readlink -f $0 2>/dev/null || perl -MCwd=abs_path -le 'print abs_path readlink(shift);' $0 2>/dev/null)"
|
||||
elif [[ -f $0 ]]; then
|
||||
# Resolve the instllation path
|
||||
if [[ -L "$POWERLEVEL9K_INSTALLATION_PATH" ]]; then
|
||||
# If this theme is sourced as a symlink, we need to locate the real URL
|
||||
filename="$(realpath -P $POWERLEVEL9K_INSTALLATION_PATH 2>/dev/null || readlink -f $POWERLEVEL9K_INSTALLATION_PATH 2>/dev/null || perl -MCwd=abs_path -le 'print abs_path readlink(shift);' $POWERLEVEL9K_INSTALLATION_PATH 2>/dev/null)"
|
||||
elif [[ -d "$POWERLEVEL9K_INSTALLATION_PATH" ]]; then
|
||||
# Directory
|
||||
filename="${POWERLEVEL9K_INSTALLATION_PATH}/powerlevel9k.zsh-theme"
|
||||
elif [[ -f "$POWERLEVEL9K_INSTALLATION_PATH" ]]; then
|
||||
# Script is a file
|
||||
filename="$0"
|
||||
filename="$POWERLEVEL9K_INSTALLATION_PATH"
|
||||
elif [[ -z "$POWERLEVEL9K_INSTALLATION_PATH" ]]; then
|
||||
# Fallback: specify an installation path!
|
||||
print -P "%F{red}We could not locate the installation path of powerlevel9k.%f"
|
||||
print -P "Please specify by setting %F{blue}POWERLEVEL9K_INSTALLATION_PATH%f (full path incl. file name) at the very beginning of your ~/.zshrc"
|
||||
return 1
|
||||
else
|
||||
print -P "%F{red}Script location could not be found!%f"
|
||||
print -P "%F{red}Script location could not be found! Maybe your %F{blue}POWERLEVEL9K_INSTALLATION_PATH%F{red} is not correct?%f"
|
||||
return 1
|
||||
fi
|
||||
script_location="$(dirname $filename)"
|
||||
|
|
@ -288,6 +289,19 @@ right_prompt_segment() {
|
|||
# right-left but reads the opposite, this isn't necessary for the other side.
|
||||
CURRENT_BG='NONE'
|
||||
|
||||
# Anaconda Environment
|
||||
prompt_anaconda() {
|
||||
# Depending on the conda version, either might be set. This
|
||||
# variant works even if both are set.
|
||||
_path=$CONDA_ENV_PATH$CONDA_PREFIX
|
||||
if ! [ -z "$_path" ]; then
|
||||
# config - can be overwritten in users' zshrc file.
|
||||
set_default POWERLEVEL9K_ANACONDA_LEFT_DELIMITER "("
|
||||
set_default POWERLEVEL9K_ANACONDA_RIGHT_DELIMITER ")"
|
||||
"$1_prompt_segment" "$0" "$2" "$3" "$4" "$POWERLEVEL9K_ANACONDA_LEFT_DELIMITER$(basename $_path)$POWERLEVEL9K_ANACONDA_RIGHT_DELIMITER" 'PYTHON_ICON'
|
||||
fi
|
||||
}
|
||||
|
||||
# AWS Profile
|
||||
prompt_aws() {
|
||||
local aws_profile="$AWS_DEFAULT_PROFILE"
|
||||
|
|
@ -310,6 +324,10 @@ prompt_aws_eb_env() {
|
|||
set_default POWERLEVEL9K_BACKGROUND_JOBS_VERBOSE true
|
||||
prompt_background_jobs() {
|
||||
local background_jobs_number=${$(jobs -l | wc -l)// /}
|
||||
local wrong_lines=`jobs -l | awk '/pwd now/{ count++ } END {print count}'`
|
||||
if [[ wrong_lines -gt 0 ]]; then
|
||||
background_jobs_number=$(( $background_jobs_number - $wrong_lines ))
|
||||
fi
|
||||
if [[ background_jobs_number -gt 0 ]]; then
|
||||
local background_jobs_number_print=""
|
||||
if [[ "$POWERLEVEL9K_BACKGROUND_JOBS_VERBOSE" == "true" ]] && [[ "$background_jobs_number" -gt 1 ]]; then
|
||||
|
|
@ -343,7 +361,7 @@ prompt_battery() {
|
|||
local time_remaining=$(echo $raw_data | grep TimeRemaining | awk '{ print $5 }')
|
||||
if [[ -n $time_remaining ]]; then
|
||||
# this value is set to a very high number when the system is calculating
|
||||
[[ $time_remaining -gt 10000 ]] && local tstring="..." || local tstring=${(f)$(date -u -r $(($time_remaining * 60)) +%k:%M)}
|
||||
[[ $time_remaining -gt 10000 ]] && local tstring="..." || local tstring=${(f)$(/bin/date -u -r $(($time_remaining * 60)) +%k:%M)}
|
||||
fi
|
||||
|
||||
# Get charge values
|
||||
|
|
@ -403,6 +421,8 @@ prompt_battery() {
|
|||
set_default POWERLEVEL9K_BATTERY_VERBOSE true
|
||||
if [[ "$POWERLEVEL9K_BATTERY_VERBOSE" == true ]]; then
|
||||
message="$bat_percent%%$remain"
|
||||
else
|
||||
message="$bat_percent%%"
|
||||
fi
|
||||
|
||||
# Draw the prompt_segment
|
||||
|
|
@ -428,8 +448,11 @@ prompt_context() {
|
|||
# the output in a segment.
|
||||
prompt_custom() {
|
||||
local command=POWERLEVEL9K_CUSTOM_$3:u
|
||||
local segment_content="$(eval ${(P)command})"
|
||||
|
||||
"$1_prompt_segment" "${0}_${3:u}" "$2" $DEFAULT_COLOR_INVERTED $DEFAULT_COLOR "$(eval ${(P)command})"
|
||||
if [[ -n $segment_content ]]; then
|
||||
"$1_prompt_segment" "${0}_${3:u}" "$2" $DEFAULT_COLOR_INVERTED $DEFAULT_COLOR "$segment_content"
|
||||
fi
|
||||
}
|
||||
|
||||
# Dir: current working directory
|
||||
|
|
@ -444,7 +467,35 @@ prompt_dir() {
|
|||
current_path=$(pwd | sed -e "s,^$HOME,~," | sed $SED_EXTENDED_REGEX_PARAMETER "s/([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})[^/]+([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})\//\1$POWERLEVEL9K_SHORTEN_DELIMITER\2\//g")
|
||||
;;
|
||||
truncate_from_right)
|
||||
current_path=$(pwd | sed -e "s,^$HOME,~," | sed $SED_EXTENDED_REGEX_PARAMETER "s/([^/]{$POWERLEVEL9K_SHORTEN_DIR_LENGTH})[^/]+\//\1$POWERLEVEL9K_SHORTEN_DELIMITER\//g")
|
||||
current_path=$(truncatePathFromRight "$(pwd | sed -e "s,^$HOME,~,")" )
|
||||
;;
|
||||
truncate_with_package_name)
|
||||
local name repo_path package_path current_dir zero
|
||||
|
||||
# Get the path of the Git repo, which should have the package.json file
|
||||
if [[ $(git rev-parse --is-inside-work-tree 2> /dev/null) == "true" ]]; then
|
||||
package_path=$(git rev-parse --show-toplevel)
|
||||
elif [[ $(git rev-parse --is-inside-git-dir 2> /dev/null) == "true" ]]; then
|
||||
package_path=${$(pwd)%%/.git*}
|
||||
fi
|
||||
|
||||
zero='%([BSUbfksu]|([FB]|){*})'
|
||||
current_dir=$(pwd)
|
||||
# Then, find the length of the package_path string, and save the
|
||||
# subdirectory path as a substring of the current directory's path from 0
|
||||
# to the length of the package path's string
|
||||
subdirectory_path=$(truncatePathFromRight "${current_dir:${#${(S%%)package_path//$~zero/}}}")
|
||||
# Parse the 'name' from the package.json; if there are any problems, just
|
||||
# print the file path
|
||||
if name=$( cat "$package_path/package.json" 2> /dev/null | grep -m 1 "\"name\""); then
|
||||
name=$(echo $name | awk -F ':' '{print $2}' | awk -F '"' '{print $2}')
|
||||
|
||||
# Instead of printing out the full path, print out the name of the package
|
||||
# from the package.json and append the current subdirectory
|
||||
current_path="`echo $name | tr -d '"'`$subdirectory_path"
|
||||
else
|
||||
current_path=$(truncatePathFromRight "$(pwd | sed -e "s,^$HOME,~,")" )
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
current_path="%$((POWERLEVEL9K_SHORTEN_DIR_LENGTH+1))(c:$POWERLEVEL9K_SHORTEN_DELIMITER/:)%${POWERLEVEL9K_SHORTEN_DIR_LENGTH}c"
|
||||
|
|
@ -463,6 +514,15 @@ prompt_dir() {
|
|||
fi
|
||||
}
|
||||
|
||||
# Docker machine
|
||||
prompt_docker_machine() {
|
||||
local docker_machine="$DOCKER_MACHINE_NAME"
|
||||
|
||||
if [[ -n "$docker_machine" ]]; then
|
||||
"$1_prompt_segment" "$0" "$2" "magenta" "$DEFAULT_COLOR" "$docker_machine" 'SERVER_ICON'
|
||||
fi
|
||||
}
|
||||
|
||||
# GO prompt
|
||||
prompt_go_version() {
|
||||
local go_version
|
||||
|
|
@ -521,30 +581,39 @@ prompt_ip() {
|
|||
prompt_load() {
|
||||
# The load segment can have three different states
|
||||
local current_state="unknown"
|
||||
local cores
|
||||
|
||||
typeset -AH load_states
|
||||
load_states=(
|
||||
'critical' 'red'
|
||||
'warning' 'yellow'
|
||||
'normal' 'green'
|
||||
)
|
||||
if [[ "$OS" == "OSX" ]]; then
|
||||
load_avg_5min=$(sysctl vm.loadavg | grep -o -E '[0-9]+(\.|,)[0-9]+' | head -n 1)
|
||||
|
||||
if [[ "$OS" == "OSX" ]] || [[ "$OS" == "BSD" ]]; then
|
||||
load_avg_1min=$(sysctl vm.loadavg | grep -o -E '[0-9]+(\.|,)[0-9]+' | head -n 1)
|
||||
if [[ "$OS" == "OSX" ]]; then
|
||||
cores=$(sysctl -n hw.logicalcpu)
|
||||
else
|
||||
cores=$(sysctl -n hw.ncpu)
|
||||
fi
|
||||
else
|
||||
load_avg_5min=$(grep -o "[0-9.]*" /proc/loadavg | head -n 1)
|
||||
load_avg_1min=$(grep -o "[0-9.]*" /proc/loadavg | head -n 1)
|
||||
cores=$(nproc)
|
||||
fi
|
||||
|
||||
# Replace comma
|
||||
load_avg_5min=${load_avg_5min//,/.}
|
||||
load_avg_1min=${load_avg_1min//,/.}
|
||||
|
||||
if [[ "$load_avg_5min" -gt 10 ]]; then
|
||||
if [[ "$load_avg_1min" -gt $(bc -l <<< "${cores} * 0.7") ]]; then
|
||||
current_state="critical"
|
||||
elif [[ "$load_avg_5min" -gt 3 ]]; then
|
||||
elif [[ "$load_avg_1min" -gt $(bc -l <<< "${cores} * 0.5") ]]; then
|
||||
current_state="warning"
|
||||
else
|
||||
current_state="normal"
|
||||
fi
|
||||
|
||||
"$1_prompt_segment" "${0}_${current_state}" "$2" "${load_states[$current_state]}" "$DEFAULT_COLOR" "$load_avg_5min" 'LOAD_ICON'
|
||||
"$1_prompt_segment" "${0}_${current_state}" "$2" "${load_states[$current_state]}" "$DEFAULT_COLOR" "$load_avg_1min" 'LOAD_ICON'
|
||||
}
|
||||
|
||||
# Node version
|
||||
|
|
@ -560,8 +629,8 @@ prompt_node_version() {
|
|||
prompt_nvm() {
|
||||
[[ ! $(type nvm) =~ 'nvm is a shell function'* ]] && return
|
||||
local node_version=$(nvm current)
|
||||
[[ -z "${node_version}" ]] || [[ ${node_version} = "none" ]] && return
|
||||
local nvm_default=$(cat $NVM_DIR/alias/default)
|
||||
[[ -z "${node_version}" ]] && return
|
||||
[[ "$node_version" =~ "$nvm_default" ]] && return
|
||||
|
||||
$1_prompt_segment "$0" "$2" "green" "011" "${node_version:1}" 'NODE_ICON'
|
||||
|
|
@ -572,7 +641,7 @@ prompt_nodeenv() {
|
|||
local nodeenv_path="$NODE_VIRTUAL_ENV"
|
||||
if [[ -n "$nodeenv_path" && "$NODE_VIRTUAL_ENV_DISABLE_PROMPT" != true ]]; then
|
||||
local info="$(node -v)[$(basename "$nodeenv_path")]"
|
||||
"$1_prompt_segment" "$0" "$2" "black" "green" "$info" 'NODE_ICON'
|
||||
"$1_prompt_segment" "$0" "$2" "black" "green" "$info" 'NODE_ICON'
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -600,8 +669,13 @@ prompt_ram() {
|
|||
# Convert pages into Bytes
|
||||
ramfree=$(( ramfree * 4096 ))
|
||||
else
|
||||
ramfree=$(grep -o -E "MemFree:\s+[0-9]+" /proc/meminfo | grep -o "[0-9]*")
|
||||
base='K'
|
||||
if [[ "$OS" == "BSD" ]]; then
|
||||
ramfree=$(vmstat | grep -E '([0-9]+\w+)+' | awk '{print $5}')
|
||||
base='M'
|
||||
else
|
||||
ramfree=$(grep -o -E "MemFree:\s+[0-9]+" /proc/meminfo | grep -o "[0-9]*")
|
||||
base='K'
|
||||
fi
|
||||
fi
|
||||
|
||||
"$1_prompt_segment" "$0" "$2" "yellow" "$DEFAULT_COLOR" "$(printSizeHumanReadable "$ramfree" $base)" 'RAM_ICON'
|
||||
|
|
@ -622,6 +696,17 @@ prompt_rbenv() {
|
|||
fi
|
||||
}
|
||||
|
||||
# chruby information
|
||||
# see https://github.com/postmodern/chruby/issues/245 for chruby_auto issue with ZSH
|
||||
prompt_chruby() {
|
||||
local chruby_env
|
||||
chrb_env="$(chruby 2> /dev/null | grep \* | tr -d '* ')"
|
||||
# Don't show anything if the chruby did not change the default ruby
|
||||
if [[ "${chrb_env:-system}" != "system" ]]; then
|
||||
"$1_prompt_segment" "$0" "$2" "red" "$DEFAULT_COLOR" "${chrb_env}" 'RUBY_ICON'
|
||||
fi
|
||||
}
|
||||
|
||||
# Print an icon if user is root.
|
||||
prompt_root_indicator() {
|
||||
if [[ "$UID" -eq 0 ]]; then
|
||||
|
|
@ -635,7 +720,7 @@ prompt_rust_version() {
|
|||
rust_version=$(rustc --version 2>&1 | grep -oe "^rustc\s*[^ ]*" | grep -o '[0-9.a-z\\\-]*$')
|
||||
|
||||
if [[ -n "$rust_version" ]]; then
|
||||
"$1_prompt_segment" "$0" "$2" "208" "$DEFAULT_COLOR" "Rust $rust_version"
|
||||
"$1_prompt_segment" "$0" "$2" "208" "$DEFAULT_COLOR" "Rust $rust_version" 'RUST_ICON'
|
||||
fi
|
||||
}
|
||||
# RSpec test ratio
|
||||
|
|
@ -663,17 +748,16 @@ prompt_rvm() {
|
|||
|
||||
# Status: return code if verbose, otherwise just an icon if an error occurred
|
||||
set_default POWERLEVEL9K_STATUS_VERBOSE true
|
||||
set_default POWERLEVEL9K_STATUS_OK_IN_NON_VERBOSE false
|
||||
prompt_status() {
|
||||
if [[ "$POWERLEVEL9K_STATUS_VERBOSE" == true ]]; then
|
||||
if [[ "$RETVAL" -ne 0 ]]; then
|
||||
if [[ "$RETVAL" -ne 0 ]]; then
|
||||
if [[ "$POWERLEVEL9K_STATUS_VERBOSE" == true ]]; then
|
||||
"$1_prompt_segment" "$0_ERROR" "$2" "red" "226" "$RETVAL" 'CARRIAGE_RETURN_ICON'
|
||||
else
|
||||
"$1_prompt_segment" "$0_OK" "$2" "$DEFAULT_COLOR" "046" "" 'OK_ICON'
|
||||
fi
|
||||
else
|
||||
if [[ "$RETVAL" -ne 0 ]]; then
|
||||
"$1_prompt_segment" "$0_ERROR" "$2" "$DEFAULT_COLOR" "red" "" 'FAIL_ICON'
|
||||
fi
|
||||
elif [[ "$POWERLEVEL9K_STATUS_VERBOSE" == true || "$POWERLEVEL9K_STATUS_OK_IN_NON_VERBOSE" == true ]]; then
|
||||
"$1_prompt_segment" "$0_OK" "$2" "$DEFAULT_COLOR" "046" "" 'OK_ICON'
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -758,39 +842,40 @@ prompt_todo() {
|
|||
|
||||
# VCS segment: shows the state of your repository, if you are in a folder under
|
||||
# version control
|
||||
prompt_vcs() {
|
||||
set_default POWERLEVEL9K_VCS_ACTIONFORMAT_FOREGROUND "red"
|
||||
# Default: Just display the first 8 characters of our changeset-ID.
|
||||
set_default POWERLEVEL9K_VCS_INTERNAL_HASH_LENGTH "8"
|
||||
powerlevel9k_vcs_init() {
|
||||
if [[ -n "$POWERLEVEL9K_CHANGESET_HASH_LENGTH" ]]; then
|
||||
POWERLEVEL9K_VCS_INTERNAL_HASH_LENGTH="$POWERLEVEL9K_CHANGESET_HASH_LENGTH"
|
||||
fi
|
||||
|
||||
# Load VCS_INFO
|
||||
autoload -Uz vcs_info
|
||||
|
||||
VCS_WORKDIR_DIRTY=false
|
||||
VCS_WORKDIR_HALF_DIRTY=false
|
||||
|
||||
# The vcs segment can have three different states - defaults to 'clean'.
|
||||
local current_state=""
|
||||
typeset -AH vcs_states
|
||||
typeset -gAH vcs_states
|
||||
vcs_states=(
|
||||
'clean' 'green'
|
||||
'modified' 'red'
|
||||
'untracked' 'yellow'
|
||||
'modified' 'yellow'
|
||||
'untracked' 'green'
|
||||
)
|
||||
|
||||
VCS_CHANGESET_PREFIX=''
|
||||
if [[ "$POWERLEVEL9K_SHOW_CHANGESET" == true ]]; then
|
||||
# Default: Just display the first 12 characters of our changeset-ID.
|
||||
local VCS_CHANGESET_HASH_LENGTH=12
|
||||
if [[ -n "$POWERLEVEL9K_CHANGESET_HASH_LENGTH" ]]; then
|
||||
VCS_CHANGESET_HASH_LENGTH="$POWERLEVEL9K_CHANGESET_HASH_LENGTH"
|
||||
fi
|
||||
|
||||
VCS_CHANGESET_PREFIX="$(print_icon 'VCS_COMMIT_ICON')%0.$VCS_CHANGESET_HASH_LENGTH""i "
|
||||
VCS_CHANGESET_PREFIX="$(print_icon 'VCS_COMMIT_ICON')%0.$POWERLEVEL9K_VCS_INTERNAL_HASH_LENGTH""i "
|
||||
fi
|
||||
|
||||
zstyle ':vcs_info:*' enable git hg
|
||||
zstyle ':vcs_info:*' enable git hg svn
|
||||
zstyle ':vcs_info:*' check-for-changes true
|
||||
|
||||
VCS_DEFAULT_FORMAT="$VCS_CHANGESET_PREFIX%b%c%u%m"
|
||||
zstyle ':vcs_info:*' formats "$VCS_DEFAULT_FORMAT"
|
||||
|
||||
zstyle ':vcs_info:*' actionformats "%b %F{red}| %a%f"
|
||||
zstyle ':vcs_info:*' actionformats "%b %F{${POWERLEVEL9K_VCS_ACTIONFORMAT_FOREGROUND}}| %a%f"
|
||||
|
||||
zstyle ':vcs_info:*' stagedstr " $(print_icon 'VCS_STAGED_ICON')"
|
||||
zstyle ':vcs_info:*' unstagedstr " $(print_icon 'VCS_UNSTAGED_ICON')"
|
||||
|
|
@ -799,6 +884,8 @@ prompt_vcs() {
|
|||
zstyle ':vcs_info:git*+set-message:*' hooks $POWERLEVEL9K_VCS_GIT_HOOKS
|
||||
defined POWERLEVEL9K_VCS_HG_HOOKS || POWERLEVEL9K_VCS_HG_HOOKS=(vcs-detect-changes)
|
||||
zstyle ':vcs_info:hg*+set-message:*' hooks $POWERLEVEL9K_VCS_HG_HOOKS
|
||||
defined POWERLEVEL9K_VCS_SVN_HOOKS || POWERLEVEL9K_VCS_SVN_HOOKS=(vcs-detect-changes svn-detect-changes)
|
||||
zstyle ':vcs_info:svn*+set-message:*' hooks $POWERLEVEL9K_VCS_SVN_HOOKS
|
||||
|
||||
# For Hg, only show the branch name
|
||||
zstyle ':vcs_info:hg*:*' branchformat "$(print_icon 'VCS_BRANCH_ICON')%b"
|
||||
|
|
@ -810,6 +897,12 @@ prompt_vcs() {
|
|||
if [[ "$POWERLEVEL9K_SHOW_CHANGESET" == true ]]; then
|
||||
zstyle ':vcs_info:*' get-revision true
|
||||
fi
|
||||
}
|
||||
|
||||
prompt_vcs() {
|
||||
VCS_WORKDIR_DIRTY=false
|
||||
VCS_WORKDIR_HALF_DIRTY=false
|
||||
current_state=""
|
||||
|
||||
# Actually invoke vcs_info manually to gather all information.
|
||||
vcs_info
|
||||
|
|
@ -851,18 +944,31 @@ prompt_vi_mode() {
|
|||
prompt_virtualenv() {
|
||||
local virtualenv_path="$VIRTUAL_ENV"
|
||||
if [[ -n "$virtualenv_path" && "$VIRTUAL_ENV_DISABLE_PROMPT" != true ]]; then
|
||||
"$1_prompt_segment" "$0" "$2" "blue" "$DEFAULT_COLOR" "($(basename "$virtualenv_path"))"
|
||||
"$1_prompt_segment" "$0" "$2" "blue" "$DEFAULT_COLOR" "$(basename "$virtualenv_path")" 'PYTHON_ICON'
|
||||
fi
|
||||
}
|
||||
|
||||
# pyenv: current active python version (with restrictions)
|
||||
# More information on pyenv (Python version manager like rbenv and rvm):
|
||||
# https://github.com/yyuu/pyenv
|
||||
# the prompt parses output of pyenv version and only displays the first word
|
||||
prompt_pyenv() {
|
||||
local pyenv_version="$(pyenv version 2>/dev/null)"
|
||||
pyenv_version="${pyenv_version%% *}"
|
||||
# XXX: The following should return the same as above.
|
||||
# This reads better for devs familiar with sed/awk/grep/cut utilities
|
||||
# Using shell expansion/substitution may hamper future maintainability
|
||||
#local pyenv_version="$(pyenv version 2>/dev/null | head -n1 | cut -d' ' -f1)"
|
||||
if [[ -n "$pyenv_version" && "$pyenv_version" != "system" ]]; then
|
||||
"$1_prompt_segment" "$0" "$2" "blue" "$DEFAULT_COLOR" "$pyenv_version" 'PYTHON_ICON'
|
||||
fi
|
||||
}
|
||||
|
||||
################################################################
|
||||
# Prompt processing and drawing
|
||||
################################################################
|
||||
|
||||
# Main prompt
|
||||
build_left_prompt() {
|
||||
defined POWERLEVEL9K_LEFT_PROMPT_ELEMENTS || POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(context dir rbenv vcs)
|
||||
|
||||
local index=1
|
||||
for element in "${POWERLEVEL9K_LEFT_PROMPT_ELEMENTS[@]}"; do
|
||||
# Remove joined information in direct calls
|
||||
|
|
@ -884,8 +990,6 @@ build_left_prompt() {
|
|||
|
||||
# Right prompt
|
||||
build_right_prompt() {
|
||||
defined POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS || POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status root_indicator background_jobs history time)
|
||||
|
||||
local index=1
|
||||
for element in "${POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS[@]}"; do
|
||||
# Remove joined information in direct calls
|
||||
|
|
@ -933,41 +1037,30 @@ $(print_icon 'MULTILINE_SECOND_PROMPT_PREFIX')"
|
|||
fi
|
||||
}
|
||||
|
||||
function zle-line-init {
|
||||
powerlevel9k_prepare_prompts
|
||||
if (( ${+terminfo[smkx]} )); then
|
||||
printf '%s' ${terminfo[smkx]}
|
||||
fi
|
||||
zle reset-prompt
|
||||
zle -R
|
||||
}
|
||||
|
||||
function zle-line-finish {
|
||||
powerlevel9k_prepare_prompts
|
||||
if (( ${+terminfo[rmkx]} )); then
|
||||
printf '%s' ${terminfo[rmkx]}
|
||||
fi
|
||||
zle reset-prompt
|
||||
zle -R
|
||||
}
|
||||
|
||||
function zle-keymap-select {
|
||||
powerlevel9k_prepare_prompts
|
||||
zle reset-prompt
|
||||
zle -R
|
||||
}
|
||||
|
||||
powerlevel9k_init() {
|
||||
# Display a warning if the terminal does not support 256 colors
|
||||
local term_colors
|
||||
term_colors=$(echotc Co)
|
||||
if (( term_colors < 256 )); then
|
||||
if (( $term_colors < 256 )); then
|
||||
print -P "%F{red}WARNING!%f Your terminal appears to support less than 256 colors!"
|
||||
print -P "If your terminal supports 256 colors, please export the appropriate environment variable"
|
||||
print -P "_before_ loading this theme in your \~\/.zshrc. In most terminal emulators, putting"
|
||||
print -P "%F{blue}export TERM=\"xterm-256color\"%f at the top of your \~\/.zshrc is sufficient."
|
||||
fi
|
||||
|
||||
# If the terminal `LANG` is set to `C`, this theme will not work at all.
|
||||
local term_lang
|
||||
term_lang=$(echo $LANG)
|
||||
if [[ $term_lang == 'C' ]]; then
|
||||
print -P "\t%F{red}WARNING!%f Your terminal's 'LANG' is set to 'C', which breaks this theme!"
|
||||
print -P "\t%F{red}WARNING!%f Please set your 'LANG' to a UTF-8 language, like 'en_US.UTF-8'"
|
||||
print -P "\t%F{red}WARNING!%f _before_ loading this theme in your \~\.zshrc. Putting"
|
||||
print -P "\t%F{red}WARNING!%f %F{blue}export LANG=\"en_US.UTF-8\"%f at the top of your \~\/.zshrc is sufficient."
|
||||
fi
|
||||
|
||||
defined POWERLEVEL9K_LEFT_PROMPT_ELEMENTS || POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(context dir rbenv vcs)
|
||||
defined POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS || POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status root_indicator background_jobs history time)
|
||||
|
||||
# Display a warning if deprecated segments are in use.
|
||||
typeset -AH deprecated_segments
|
||||
# old => new
|
||||
|
|
@ -985,15 +1078,15 @@ powerlevel9k_init() {
|
|||
# initialize colors
|
||||
autoload -U colors && colors
|
||||
|
||||
if segment_in_use "vcs"; then
|
||||
powerlevel9k_vcs_init
|
||||
fi
|
||||
|
||||
# initialize hooks
|
||||
autoload -Uz add-zsh-hook
|
||||
|
||||
# prepare prompts
|
||||
add-zsh-hook precmd powerlevel9k_prepare_prompts
|
||||
|
||||
zle -N zle-line-init
|
||||
zle -N zle-line-finish
|
||||
zle -N zle-keymap-select
|
||||
}
|
||||
|
||||
powerlevel9k_init "$@"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue