mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-11-16 17:50:09 +00:00
Merge branch 'next' into color_detection
This commit is contained in:
Dominik Ritter
commit
c10cbabb9e
2 changed files with 96 additions and 74 deletions
30
README.md
30
README.md
|
|
@ -25,9 +25,9 @@ this theme focus on four primary goals:
|
||||||
4. Optimize the code for execution speed as much as possible. A snappy terminal
|
4. Optimize the code for execution speed as much as possible. A snappy terminal
|
||||||
is a happy terminal.
|
is a happy terminal.
|
||||||
|
|
||||||
Here is a detailed screenshot showing `powerlevel9k` in action, with default settings.
|
Here is `powerlevel9k` in action, with [some simple settings](https://github.com/bhilburn/powerlevel9k/wiki/Show-Off-Your-Config#natemccurdys-configuration).
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
### Table of Contents
|
### Table of Contents
|
||||||
|
|
||||||
|
|
@ -77,6 +77,7 @@ The segments that are currently available are:
|
||||||
* [ip](#ip) - Shows the current IP address.
|
* [ip](#ip) - Shows the current IP address.
|
||||||
* **load** - Your machines 5 minute load average and free RAM.
|
* **load** - Your machines 5 minute load average and free RAM.
|
||||||
* **node_version** - Show the version number of the installed Node.js.
|
* **node_version** - Show the version number of the installed Node.js.
|
||||||
|
* **nvm** - Show the version of Node that is currently active, if it differs from the version used by NVM
|
||||||
* **os_icon** - Display a nice little icon, depending on your operating system.
|
* **os_icon** - Display a nice little icon, depending on your operating system.
|
||||||
* **php_version** - Show the current PHP version.
|
* **php_version** - Show the current PHP version.
|
||||||
* [rbenv](#rbenv) - Ruby environment information (if one is active).
|
* [rbenv](#rbenv) - Ruby environment information (if one is active).
|
||||||
|
|
@ -85,6 +86,7 @@ The segments that are currently available are:
|
||||||
* [symphony2_tests](#symphony2_tests) - Show a ratio of test classes vs code classes for Symfony2.
|
* [symphony2_tests](#symphony2_tests) - Show a ratio of test classes vs code classes for Symfony2.
|
||||||
* **symphony2_version** - Show the current Symfony2 version, if you are in a Symfony2-Project dir.
|
* **symphony2_version** - Show the current Symfony2 version, if you are in a Symfony2-Project dir.
|
||||||
* [time](#time) - System time.
|
* [time](#time) - System time.
|
||||||
|
* [todo](http://todotxt.com/) - Shows the number of tasks in your todo.txt tasks file.
|
||||||
* [vi_mode](#vi_mode)- Vi editing mode (NORMAL|INSERT).
|
* [vi_mode](#vi_mode)- Vi editing mode (NORMAL|INSERT).
|
||||||
* **virtualenv** - Your Python [VirtualEnv](https://virtualenv.pypa.io/en/latest/).
|
* **virtualenv** - Your Python [VirtualEnv](https://virtualenv.pypa.io/en/latest/).
|
||||||
* [vcs](#vcs) - Information about this `git` or `hg` repository (if you are in one).
|
* [vcs](#vcs) - Information about this `git` or `hg` repository (if you are in one).
|
||||||
|
|
@ -213,23 +215,17 @@ from the [Installation](#Installation) section above.
|
||||||
|
|
||||||
##### vi_mode
|
##### vi_mode
|
||||||
|
|
||||||
This Segment shows the current mode of your ZSH. If you want to use your ZSH in
|
This segment shows ZSH's current input mode. Note that this is only useful if
|
||||||
VI-Mode, you need to configure it separately in your `~/.zshrc`:
|
you are using the [ZSH Line Editor](http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html)
|
||||||
|
(VI mode). You can enable this either by `.zshrc` configuration or using a plugin, like
|
||||||
|
[Oh-My-Zsh's vi-mode plugin](https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/vi-mode/vi-mode.plugin.zsh).
|
||||||
|
|
||||||
# VI-Mode
|
If you want to display a string other than "NORMAL" or "INSERT" in `command` and
|
||||||
# general activation
|
`insert-mode`, you can do so by setting the following variables in your
|
||||||
bindkey -v
|
`~/.zshrc`:
|
||||||
|
|
||||||
# set some nice hotkeys
|
POWERLEVEL9K_VI_INSERT_MODE_STRING="INSERT"
|
||||||
bindkey '^P' up-history
|
POWERLEVEL9K_VI_COMMAND_MODE_STRING="NORMAL"
|
||||||
bindkey '^N' down-history
|
|
||||||
bindkey '^?' backward-delete-char
|
|
||||||
bindkey '^h' backward-delete-char
|
|
||||||
bindkey '^w' backward-kill-word
|
|
||||||
bindkey '^r' history-incremental-search-backward
|
|
||||||
|
|
||||||
# make it more responsive
|
|
||||||
export KEYTIMEOUT=1
|
|
||||||
|
|
||||||
#### Unit Test Ratios
|
#### Unit Test Ratios
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -45,6 +45,7 @@ case $POWERLEVEL9K_MODE in
|
||||||
AWS_ICON $'\UE895' #
|
AWS_ICON $'\UE895' #
|
||||||
BACKGROUND_JOBS_ICON $'\UE82F ' #
|
BACKGROUND_JOBS_ICON $'\UE82F ' #
|
||||||
TEST_ICON $'\UE891' #
|
TEST_ICON $'\UE891' #
|
||||||
|
TODO_ICON $'\U2611' # ☑
|
||||||
OK_ICON $'\U2713' # ✓
|
OK_ICON $'\U2713' # ✓
|
||||||
FAIL_ICON $'\U2718' # ✘
|
FAIL_ICON $'\U2718' # ✘
|
||||||
SYMFONY_ICON 'SF'
|
SYMFONY_ICON 'SF'
|
||||||
|
|
@ -93,6 +94,7 @@ case $POWERLEVEL9K_MODE in
|
||||||
AWS_ICON $'\UF296' #
|
AWS_ICON $'\UF296' #
|
||||||
BACKGROUND_JOBS_ICON $'\UF013 ' #
|
BACKGROUND_JOBS_ICON $'\UF013 ' #
|
||||||
TEST_ICON $'\UF291' #
|
TEST_ICON $'\UF291' #
|
||||||
|
TODO_ICON $'\U2611' # ☑
|
||||||
OK_ICON $'\UF23A' #
|
OK_ICON $'\UF23A' #
|
||||||
FAIL_ICON $'\UF281' #
|
FAIL_ICON $'\UF281' #
|
||||||
SYMFONY_ICON 'SF'
|
SYMFONY_ICON 'SF'
|
||||||
|
|
@ -136,6 +138,7 @@ case $POWERLEVEL9K_MODE in
|
||||||
AWS_ICON 'AWS:'
|
AWS_ICON 'AWS:'
|
||||||
BACKGROUND_JOBS_ICON $'\u2699' # ⚙
|
BACKGROUND_JOBS_ICON $'\u2699' # ⚙
|
||||||
TEST_ICON ''
|
TEST_ICON ''
|
||||||
|
TODO_ICON $'\U2611' # ☑
|
||||||
OK_ICON $'\u2713' # ✓
|
OK_ICON $'\u2713' # ✓
|
||||||
FAIL_ICON $'\u2718' # ✘
|
FAIL_ICON $'\u2718' # ✘
|
||||||
SYMFONY_ICON 'SF'
|
SYMFONY_ICON 'SF'
|
||||||
|
|
@ -389,10 +392,121 @@ set_default POWERLEVEL9K_VCS_FOREGROUND "$DEFAULT_COLOR"
|
||||||
set_default POWERLEVEL9K_VCS_DARK_FOREGROUND "$DEFAULT_COLOR_DARK"
|
set_default POWERLEVEL9K_VCS_DARK_FOREGROUND "$DEFAULT_COLOR_DARK"
|
||||||
|
|
||||||
################################################################
|
################################################################
|
||||||
# VCS Information Settings
|
# Prompt Segment Constructors
|
||||||
|
#
|
||||||
|
# Methodology behind user-defined variables overwriting colors:
|
||||||
|
# The first parameter to the segment constructors is the calling function's
|
||||||
|
# name. From this function name, we strip the "prompt_"-prefix and
|
||||||
|
# uppercase it. This is then prefixed with "POWERLEVEL9K_" and suffixed
|
||||||
|
# with either "_BACKGROUND" or "_FOREGROUND", thus giving us the variable
|
||||||
|
# name. So each new segment is user-overwritable by a variable following
|
||||||
|
# this naming convention.
|
||||||
################################################################
|
################################################################
|
||||||
|
|
||||||
setopt prompt_subst
|
# The `CURRENT_BG` variable is used to remember what the last BG color used was
|
||||||
|
# when building the left-hand prompt. Because the RPROMPT is created from
|
||||||
|
# right-left but reads the opposite, this isn't necessary for the other side.
|
||||||
|
CURRENT_BG='NONE'
|
||||||
|
|
||||||
|
# Begin a left prompt segment
|
||||||
|
# Takes four arguments:
|
||||||
|
# * $1: Name of the function that was orginally invoked (mandatory).
|
||||||
|
# Necessary, to make the dynamic color-overwrite mechanism work.
|
||||||
|
# * $2: Background color
|
||||||
|
# * $3: Foreground color
|
||||||
|
# * $4: The segment content
|
||||||
|
# The latter three can be omitted,
|
||||||
|
set_default POWERLEVEL9K_WHITESPACE_BETWEEN_LEFT_SEGMENTS " "
|
||||||
|
left_prompt_segment() {
|
||||||
|
# Overwrite given background-color by user defined variable for this segment.
|
||||||
|
local BACKGROUND_USER_VARIABLE=POWERLEVEL9K_${(U)1#prompt_}_BACKGROUND
|
||||||
|
local BG_COLOR_MODIFIER=${(P)BACKGROUND_USER_VARIABLE}
|
||||||
|
[[ -n $BG_COLOR_MODIFIER ]] && 2="$BG_COLOR_MODIFIER"
|
||||||
|
|
||||||
|
# Overwrite given foreground-color by user defined variable for this segment.
|
||||||
|
local FOREGROUND_USER_VARIABLE=POWERLEVEL9K_${(U)1#prompt_}_FOREGROUND
|
||||||
|
local FG_COLOR_MODIFIER=${(P)FOREGROUND_USER_VARIABLE}
|
||||||
|
[[ -n $FG_COLOR_MODIFIER ]] && 3="$FG_COLOR_MODIFIER"
|
||||||
|
|
||||||
|
local bg fg
|
||||||
|
[[ -n $2 ]] && bg="%K{$2}" || bg="%k"
|
||||||
|
[[ -n $3 ]] && fg="%F{$3}" || fg="%f"
|
||||||
|
if [[ $CURRENT_BG != 'NONE' ]] && ! isSameColor "$2" "$CURRENT_BG"; then
|
||||||
|
# Middle segment
|
||||||
|
echo -n "%{$bg%F{$CURRENT_BG}%}$(print_icon 'LEFT_SEGMENT_SEPARATOR')%{$fg%}$POWERLEVEL9K_WHITESPACE_BETWEEN_LEFT_SEGMENTS"
|
||||||
|
elif isSameColor "$CURRENT_BG" "$2"; then
|
||||||
|
# Middle segment with same color as previous segment
|
||||||
|
# We take the current foreground color as color for our
|
||||||
|
# subsegment (or the default color). This should have
|
||||||
|
# enough contrast.
|
||||||
|
local complement
|
||||||
|
[[ -n $3 ]] && complement=$3 || complement=$DEFAULT_COLOR
|
||||||
|
echo -n "%{$bg%F{$complement}%}$(print_icon 'LEFT_SUBSEGMENT_SEPARATOR')%{$fg%}$POWERLEVEL9K_WHITESPACE_BETWEEN_LEFT_SEGMENTS"
|
||||||
|
else
|
||||||
|
# First segment
|
||||||
|
echo -n "%{$bg%}%{$fg%}$POWERLEVEL9K_WHITESPACE_BETWEEN_LEFT_SEGMENTS"
|
||||||
|
fi
|
||||||
|
CURRENT_BG=$2
|
||||||
|
[[ -n $4 ]] && echo -n "$4$POWERLEVEL9K_WHITESPACE_BETWEEN_LEFT_SEGMENTS"
|
||||||
|
}
|
||||||
|
|
||||||
|
# End the left prompt, closes the final segment.
|
||||||
|
left_prompt_end() {
|
||||||
|
if [[ -n $CURRENT_BG ]]; then
|
||||||
|
echo -n "%{%k%F{$CURRENT_BG}%}$(print_icon 'LEFT_SEGMENT_SEPARATOR')"
|
||||||
|
else
|
||||||
|
echo -n "%k"
|
||||||
|
fi
|
||||||
|
echo -n "%f "
|
||||||
|
CURRENT_BG=''
|
||||||
|
}
|
||||||
|
|
||||||
|
CURRENT_RIGHT_BG='NONE'
|
||||||
|
|
||||||
|
# Begin a right prompt segment
|
||||||
|
# Takes four arguments:
|
||||||
|
# * $1: Name of the function that was orginally invoked (mandatory).
|
||||||
|
# Necessary, to make the dynamic color-overwrite mechanism work.
|
||||||
|
# * $2: Background color
|
||||||
|
# * $3: Foreground color
|
||||||
|
# * $4: The segment content
|
||||||
|
# No ending for the right prompt segment is needed (unlike the left prompt, above).
|
||||||
|
set_default POWERLEVEL9K_WHITESPACE_BETWEEN_RIGHT_SEGMENTS " "
|
||||||
|
right_prompt_segment() {
|
||||||
|
# Overwrite given background-color by user defined variable for this segment.
|
||||||
|
local BACKGROUND_USER_VARIABLE=POWERLEVEL9K_${(U)1#prompt_}_BACKGROUND
|
||||||
|
local BG_COLOR_MODIFIER=${(P)BACKGROUND_USER_VARIABLE}
|
||||||
|
[[ -n $BG_COLOR_MODIFIER ]] && 2="$BG_COLOR_MODIFIER"
|
||||||
|
|
||||||
|
# Overwrite given foreground-color by user defined variable for this segment.
|
||||||
|
local FOREGROUND_USER_VARIABLE=POWERLEVEL9K_${(U)1#prompt_}_FOREGROUND
|
||||||
|
local FG_COLOR_MODIFIER=${(P)FOREGROUND_USER_VARIABLE}
|
||||||
|
[[ -n $FG_COLOR_MODIFIER ]] && 3="$FG_COLOR_MODIFIER"
|
||||||
|
|
||||||
|
local bg fg
|
||||||
|
[[ -n $2 ]] && bg="%K{$2}" || bg="%k"
|
||||||
|
[[ -n $3 ]] && fg="%F{$3}" || fg="%f"
|
||||||
|
|
||||||
|
if isSameColor "$CURRENT_RIGHT_BG" "$2"; then
|
||||||
|
# Middle segment with same color as previous segment
|
||||||
|
# We take the current foreground color as color for our
|
||||||
|
# subsegment (or the default color). This should have
|
||||||
|
# enough contrast.
|
||||||
|
local complement
|
||||||
|
[[ -n $3 ]] && complement=$3 || complement=$DEFAULT_COLOR
|
||||||
|
echo -n "%F{$complement}$(print_icon 'RIGHT_SUBSEGMENT_SEPARATOR')%f%{$bg%}%{$fg%}$POWERLEVEL9K_WHITESPACE_BETWEEN_RIGHT_SEGMENTS"
|
||||||
|
else
|
||||||
|
echo -n "%F{$2}$(print_icon 'RIGHT_SEGMENT_SEPARATOR')%f%{$bg%}%{$fg%}$POWERLEVEL9K_WHITESPACE_BETWEEN_RIGHT_SEGMENTS"
|
||||||
|
fi
|
||||||
|
[[ -n $4 ]] && echo -n "$4$POWERLEVEL9K_WHITESPACE_BETWEEN_RIGHT_SEGMENTS%f"
|
||||||
|
|
||||||
|
CURRENT_RIGHT_BG=$2
|
||||||
|
}
|
||||||
|
|
||||||
|
################################################################
|
||||||
|
# The `vcs` Segment and VCS_INFO hooks / helper functions
|
||||||
|
################################################################
|
||||||
|
prompt_vcs() {
|
||||||
autoload -Uz vcs_info
|
autoload -Uz vcs_info
|
||||||
|
|
||||||
VCS_WORKDIR_DIRTY=false
|
VCS_WORKDIR_DIRTY=false
|
||||||
|
|
@ -433,120 +547,8 @@ if [[ "$POWERLEVEL9K_SHOW_CHANGESET" == true ]]; then
|
||||||
zstyle ':vcs_info:*' get-revision true
|
zstyle ':vcs_info:*' get-revision true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
################################################################
|
# Actually invoke vcs_info manually to gather all information.
|
||||||
# Prompt Segment Constructors
|
vcs_info
|
||||||
#
|
|
||||||
# Methodology behind user-defined variables overwriting colors:
|
|
||||||
# The first parameter to the segment constructors is the calling function's
|
|
||||||
# name. From this function name, we strip the "prompt_"-prefix and
|
|
||||||
# uppercase it. This is then prefixed with "POWERLEVEL9K_" and suffixed
|
|
||||||
# with either "_BACKGROUND" or "_FOREGROUND", thus giving us the variable
|
|
||||||
# name. So each new segment is user-overwritable by a variable following
|
|
||||||
# this naming convention.
|
|
||||||
################################################################
|
|
||||||
|
|
||||||
# The `CURRENT_BG` variable is used to remember what the last BG color used was
|
|
||||||
# when building the left-hand prompt. Because the RPROMPT is created from
|
|
||||||
# right-left but reads the opposite, this isn't necessary for the other side.
|
|
||||||
CURRENT_BG='NONE'
|
|
||||||
|
|
||||||
# Begin a left prompt segment
|
|
||||||
# Takes four arguments:
|
|
||||||
# * $1: Name of the function that was orginally invoked (mandatory).
|
|
||||||
# Necessary, to make the dynamic color-overwrite mechanism work.
|
|
||||||
# * $2: Background color
|
|
||||||
# * $3: Foreground color
|
|
||||||
# * $4: The segment content
|
|
||||||
# The latter three can be omitted,
|
|
||||||
left_prompt_segment() {
|
|
||||||
# Overwrite given background-color by user defined variable for this segment.
|
|
||||||
local BACKGROUND_USER_VARIABLE=POWERLEVEL9K_${(U)1#prompt_}_BACKGROUND
|
|
||||||
local BG_COLOR_MODIFIER=${(P)BACKGROUND_USER_VARIABLE}
|
|
||||||
[[ -n $BG_COLOR_MODIFIER ]] && 2="$BG_COLOR_MODIFIER"
|
|
||||||
|
|
||||||
# Overwrite given foreground-color by user defined variable for this segment.
|
|
||||||
local FOREGROUND_USER_VARIABLE=POWERLEVEL9K_${(U)1#prompt_}_FOREGROUND
|
|
||||||
local FG_COLOR_MODIFIER=${(P)FOREGROUND_USER_VARIABLE}
|
|
||||||
[[ -n $FG_COLOR_MODIFIER ]] && 3="$FG_COLOR_MODIFIER"
|
|
||||||
|
|
||||||
local bg fg
|
|
||||||
[[ -n $2 ]] && bg="%K{$2}" || bg="%k"
|
|
||||||
[[ -n $3 ]] && fg="%F{$3}" || fg="%f"
|
|
||||||
if [[ $CURRENT_BG != 'NONE' ]] && ! isSameColor "$2" "$CURRENT_BG"; then
|
|
||||||
# Middle segment
|
|
||||||
echo -n "%{$bg%F{$CURRENT_BG}%}$(print_icon 'LEFT_SEGMENT_SEPARATOR')%{$fg%} "
|
|
||||||
elif isSameColor "$CURRENT_BG" "$2"; then
|
|
||||||
# Middle segment with same color as previous segment
|
|
||||||
# We take the current foreground color as color for our
|
|
||||||
# subsegment (or the default color). This should have
|
|
||||||
# enough contrast.
|
|
||||||
local complement
|
|
||||||
[[ -n $3 ]] && complement=$3 || complement=$DEFAULT_COLOR
|
|
||||||
echo -n "%{$bg%F{$complement}%}$(print_icon 'LEFT_SUBSEGMENT_SEPARATOR')%{$fg%} "
|
|
||||||
else
|
|
||||||
# First segment
|
|
||||||
echo -n "%{$bg%}%{$fg%} "
|
|
||||||
fi
|
|
||||||
CURRENT_BG=$2
|
|
||||||
[[ -n $4 ]] && echo -n "$4 "
|
|
||||||
}
|
|
||||||
|
|
||||||
# End the left prompt, closes the final segment.
|
|
||||||
left_prompt_end() {
|
|
||||||
if [[ -n $CURRENT_BG ]]; then
|
|
||||||
echo -n "%{%k%F{$CURRENT_BG}%}$(print_icon 'LEFT_SEGMENT_SEPARATOR')"
|
|
||||||
else
|
|
||||||
echo -n "%k"
|
|
||||||
fi
|
|
||||||
echo -n "%f "
|
|
||||||
CURRENT_BG=''
|
|
||||||
}
|
|
||||||
|
|
||||||
CURRENT_RIGHT_BG='NONE'
|
|
||||||
|
|
||||||
# Begin a right prompt segment
|
|
||||||
# Takes four arguments:
|
|
||||||
# * $1: Name of the function that was orginally invoked (mandatory).
|
|
||||||
# Necessary, to make the dynamic color-overwrite mechanism work.
|
|
||||||
# * $2: Background color
|
|
||||||
# * $3: Foreground color
|
|
||||||
# * $4: The segment content
|
|
||||||
# No ending for the right prompt segment is needed (unlike the left prompt, above).
|
|
||||||
right_prompt_segment() {
|
|
||||||
# Overwrite given background-color by user defined variable for this segment.
|
|
||||||
local BACKGROUND_USER_VARIABLE=POWERLEVEL9K_${(U)1#prompt_}_BACKGROUND
|
|
||||||
local BG_COLOR_MODIFIER=${(P)BACKGROUND_USER_VARIABLE}
|
|
||||||
[[ -n $BG_COLOR_MODIFIER ]] && 2="$BG_COLOR_MODIFIER"
|
|
||||||
|
|
||||||
# Overwrite given foreground-color by user defined variable for this segment.
|
|
||||||
local FOREGROUND_USER_VARIABLE=POWERLEVEL9K_${(U)1#prompt_}_FOREGROUND
|
|
||||||
local FG_COLOR_MODIFIER=${(P)FOREGROUND_USER_VARIABLE}
|
|
||||||
[[ -n $FG_COLOR_MODIFIER ]] && 3="$FG_COLOR_MODIFIER"
|
|
||||||
|
|
||||||
local bg fg
|
|
||||||
[[ -n $2 ]] && bg="%K{$2}" || bg="%k"
|
|
||||||
[[ -n $3 ]] && fg="%F{$3}" || fg="%f"
|
|
||||||
|
|
||||||
if isSameColor "$CURRENT_RIGHT_BG" "$2"; then
|
|
||||||
# Middle segment with same color as previous segment
|
|
||||||
# We take the current foreground color as color for our
|
|
||||||
# subsegment (or the default color). This should have
|
|
||||||
# enough contrast.
|
|
||||||
local complement
|
|
||||||
[[ -n $3 ]] && complement=$3 || complement=$DEFAULT_COLOR
|
|
||||||
echo -n "%F{$complement}$(print_icon 'RIGHT_SUBSEGMENT_SEPARATOR')%f%{$bg%}%{$fg%} "
|
|
||||||
else
|
|
||||||
echo -n "%F{$2}$(print_icon 'RIGHT_SEGMENT_SEPARATOR')%f%{$bg%}%{$fg%} "
|
|
||||||
fi
|
|
||||||
[[ -n $4 ]] && echo -n "$4 %f"
|
|
||||||
|
|
||||||
CURRENT_RIGHT_BG=$2
|
|
||||||
}
|
|
||||||
|
|
||||||
################################################################
|
|
||||||
# The `vcs` Segment and VCS_INFO hooks / helper functions
|
|
||||||
################################################################
|
|
||||||
prompt_vcs() {
|
|
||||||
local vcs_prompt="${vcs_info_msg_0_}"
|
local vcs_prompt="${vcs_info_msg_0_}"
|
||||||
|
|
||||||
if [[ -n "$vcs_prompt" ]]; then
|
if [[ -n "$vcs_prompt" ]]; then
|
||||||
|
|
@ -800,6 +802,17 @@ prompt_php_version() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Node version from NVM
|
||||||
|
# Only prints the segment if different than the default value
|
||||||
|
prompt_nvm() {
|
||||||
|
local node_version=$(nvm current)
|
||||||
|
local nvm_default=$(cat $NVM_DIR/alias/default)
|
||||||
|
[[ -z "${node_version}" ]] && return
|
||||||
|
[[ "$node_version" =~ "$nvm_default" ]] && return
|
||||||
|
NODE_ICON=$'\u2B22' # ⬢
|
||||||
|
$1_prompt_segment "$0" "green" "011" "${node_version:1} $NODE_ICON"
|
||||||
|
}
|
||||||
|
|
||||||
# rbenv information
|
# rbenv information
|
||||||
prompt_rbenv() {
|
prompt_rbenv() {
|
||||||
if [[ -n "$RBENV_VERSION" ]]; then
|
if [[ -n "$RBENV_VERSION" ]]; then
|
||||||
|
|
@ -897,14 +910,26 @@ prompt_time() {
|
||||||
"$1_prompt_segment" "$0" "$DEFAULT_COLOR_INVERTED" "$DEFAULT_COLOR" "$time_format"
|
"$1_prompt_segment" "$0" "$DEFAULT_COLOR_INVERTED" "$DEFAULT_COLOR" "$time_format"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# todo.sh: shows the number of tasks in your todo.sh file
|
||||||
|
prompt_todo() {
|
||||||
|
if $(hash todo.sh 2>&-); then
|
||||||
|
count=$(todo.sh ls | egrep "TODO: [0-9]+ of ([0-9]+) tasks shown" | awk '{ print $4 }')
|
||||||
|
if [[ "$count" = <-> ]]; then
|
||||||
|
"$1_prompt_segment" "$0" "244" "$DEFAULT_COLOR" "$(print_icon 'TODO_ICON') $count"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# Vi Mode: show editing mode (NORMAL|INSERT)
|
# Vi Mode: show editing mode (NORMAL|INSERT)
|
||||||
|
set_default POWERLEVEL9K_VI_INSERT_MODE_STRING "INSERT"
|
||||||
|
set_default POWERLEVEL9K_VI_COMMAND_MODE_STRING "NORMAL"
|
||||||
prompt_vi_mode() {
|
prompt_vi_mode() {
|
||||||
case ${KEYMAP} in
|
case ${KEYMAP} in
|
||||||
main|viins)
|
main|viins)
|
||||||
"$1_prompt_segment" "$0_INSERT" "$DEFAULT_COLOR" "blue" "INSERT"
|
"$1_prompt_segment" "$0_INSERT" "$DEFAULT_COLOR" "blue" "$POWERLEVEL9K_VI_INSERT_MODE_STRING"
|
||||||
;;
|
;;
|
||||||
vicmd)
|
vicmd)
|
||||||
"$1_prompt_segment" "$0_NORMAL" "$DEFAULT_COLOR" "default" "NORMAL"
|
"$1_prompt_segment" "$0_NORMAL" "$DEFAULT_COLOR" "default" "$POWERLEVEL9K_VI_COMMAND_MODE_STRING"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
@ -914,7 +939,7 @@ prompt_vi_mode() {
|
||||||
# https://virtualenv.pypa.io/en/latest/
|
# https://virtualenv.pypa.io/en/latest/
|
||||||
prompt_virtualenv() {
|
prompt_virtualenv() {
|
||||||
local virtualenv_path="$VIRTUAL_ENV"
|
local virtualenv_path="$VIRTUAL_ENV"
|
||||||
if [[ -n "$virtualenv_path" && -n "$VIRTUAL_ENV_DISABLE_PROMPT" ]]; then
|
if [[ -n "$virtualenv_path" && "$VIRTUAL_ENV_DISABLE_PROMPT" != true ]]; then
|
||||||
"$1_prompt_segment" "$0" "blue" "$DEFAULT_COLOR" "($(basename "$virtualenv_path"))"
|
"$1_prompt_segment" "$0" "blue" "$DEFAULT_COLOR" "($(basename "$virtualenv_path"))"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
@ -987,6 +1012,8 @@ powerlevel9k_init() {
|
||||||
print "You should set TERM=xterm-256colors in your ~/.zshrc"
|
print "You should set TERM=xterm-256colors in your ~/.zshrc"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
setopt prompt_subst
|
||||||
|
|
||||||
setopt LOCAL_OPTIONS
|
setopt LOCAL_OPTIONS
|
||||||
unsetopt XTRACE KSH_ARRAYS
|
unsetopt XTRACE KSH_ARRAYS
|
||||||
setopt PROMPT_CR PROMPT_PERCENT PROMPT_SUBST MULTIBYTE
|
setopt PROMPT_CR PROMPT_PERCENT PROMPT_SUBST MULTIBYTE
|
||||||
|
|
@ -994,9 +1021,8 @@ powerlevel9k_init() {
|
||||||
# initialize colors
|
# initialize colors
|
||||||
autoload -U colors && colors
|
autoload -U colors && colors
|
||||||
|
|
||||||
# initialize VCS
|
# initialize hooks
|
||||||
autoload -Uz add-zsh-hook
|
autoload -Uz add-zsh-hook
|
||||||
add-zsh-hook precmd vcs_info
|
|
||||||
|
|
||||||
# prepare prompts
|
# prepare prompts
|
||||||
add-zsh-hook precmd powerlevel9k_prepare_prompts
|
add-zsh-hook precmd powerlevel9k_prepare_prompts
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue