Merge branch 'master' into sparkctl-kubecontext
This commit is contained in:
commit
eee71edfb0
|
@ -338,6 +338,7 @@ enable as many segments as you like. It won't slow down your prompt or Zsh start
|
||||||
| `nix_shell` | [nix shell](https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html) indicator |
|
| `nix_shell` | [nix shell](https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html) indicator |
|
||||||
| `nnn` | [nnn](https://github.com/jarun/nnn) shell |
|
| `nnn` | [nnn](https://github.com/jarun/nnn) shell |
|
||||||
| `lf` | [lf](https://github.com/gokcehan/lf) shell |
|
| `lf` | [lf](https://github.com/gokcehan/lf) shell |
|
||||||
|
| `chezmoi_shell` | [chezmoi](https://www.chezmoi.io/) shell |
|
||||||
| `nodeenv` | node.js environment from [nodeenv](https://github.com/ekalinin/nodeenv) |
|
| `nodeenv` | node.js environment from [nodeenv](https://github.com/ekalinin/nodeenv) |
|
||||||
| `nodenv` | node.js environment from [nodenv](https://github.com/nodenv/nodenv) |
|
| `nodenv` | node.js environment from [nodenv](https://github.com/nodenv/nodenv) |
|
||||||
| `node_version` | [node.js](https://nodejs.org/) version |
|
| `node_version` | [node.js](https://nodejs.org/) version |
|
||||||
|
|
|
@ -87,6 +87,7 @@
|
||||||
vim_shell # vim shell indicator (:sh)
|
vim_shell # vim shell indicator (:sh)
|
||||||
midnight_commander # midnight commander shell (https://midnight-commander.org/)
|
midnight_commander # midnight commander shell (https://midnight-commander.org/)
|
||||||
nix_shell # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html)
|
nix_shell # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html)
|
||||||
|
chezmoi_shell # chezmoi shell (https://www.chezmoi.io/)
|
||||||
# vi_mode # vi mode (you don't need this if you've enabled prompt_char)
|
# vi_mode # vi mode (you don't need this if you've enabled prompt_char)
|
||||||
# vpn_ip # virtual private network indicator
|
# vpn_ip # virtual private network indicator
|
||||||
# load # CPU load
|
# load # CPU load
|
||||||
|
@ -764,6 +765,12 @@
|
||||||
# Custom icon.
|
# Custom icon.
|
||||||
# typeset -g POWERLEVEL9K_NIX_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐'
|
# typeset -g POWERLEVEL9K_NIX_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐'
|
||||||
|
|
||||||
|
##################[ chezmoi_shell: chezmoi shell (https://www.chezmoi.io/) ]##################
|
||||||
|
# chezmoi shell color.
|
||||||
|
typeset -g POWERLEVEL9K_CHEZMOI_SHELL_FOREGROUND=33
|
||||||
|
# Custom icon.
|
||||||
|
# typeset -g POWERLEVEL9K_CHEZMOI_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐'
|
||||||
|
|
||||||
##################################[ disk_usage: disk usage ]##################################
|
##################################[ disk_usage: disk usage ]##################################
|
||||||
# Colors for different levels of disk usage.
|
# Colors for different levels of disk usage.
|
||||||
typeset -g POWERLEVEL9K_DISK_USAGE_NORMAL_FOREGROUND=35
|
typeset -g POWERLEVEL9K_DISK_USAGE_NORMAL_FOREGROUND=35
|
||||||
|
|
|
@ -87,6 +87,7 @@
|
||||||
vim_shell # vim shell indicator (:sh)
|
vim_shell # vim shell indicator (:sh)
|
||||||
midnight_commander # midnight commander shell (https://midnight-commander.org/)
|
midnight_commander # midnight commander shell (https://midnight-commander.org/)
|
||||||
nix_shell # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html)
|
nix_shell # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html)
|
||||||
|
chezmoi_shell # chezmoi shell (https://www.chezmoi.io/)
|
||||||
# vpn_ip # virtual private network indicator
|
# vpn_ip # virtual private network indicator
|
||||||
# load # CPU load
|
# load # CPU load
|
||||||
# disk_usage # disk usage
|
# disk_usage # disk usage
|
||||||
|
@ -759,6 +760,12 @@
|
||||||
# Custom icon.
|
# Custom icon.
|
||||||
# typeset -g POWERLEVEL9K_NIX_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐'
|
# typeset -g POWERLEVEL9K_NIX_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐'
|
||||||
|
|
||||||
|
##################[ chezmoi_shell: chezmoi shell (https://www.chezmoi.io/) ]##################
|
||||||
|
# chezmoi shell color.
|
||||||
|
typeset -g POWERLEVEL9K_CHEZMOI_SHELL_FOREGROUND=4
|
||||||
|
# Custom icon.
|
||||||
|
# typeset -g POWERLEVEL9K_CHEZMOI_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐'
|
||||||
|
|
||||||
##################################[ disk_usage: disk usage ]##################################
|
##################################[ disk_usage: disk usage ]##################################
|
||||||
# Colors for different levels of disk usage.
|
# Colors for different levels of disk usage.
|
||||||
typeset -g POWERLEVEL9K_DISK_USAGE_NORMAL_FOREGROUND=2
|
typeset -g POWERLEVEL9K_DISK_USAGE_NORMAL_FOREGROUND=2
|
||||||
|
|
|
@ -87,6 +87,7 @@
|
||||||
vim_shell # vim shell indicator (:sh)
|
vim_shell # vim shell indicator (:sh)
|
||||||
midnight_commander # midnight commander shell (https://midnight-commander.org/)
|
midnight_commander # midnight commander shell (https://midnight-commander.org/)
|
||||||
nix_shell # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html)
|
nix_shell # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html)
|
||||||
|
chezmoi_shell # chezmoi shell (https://www.chezmoi.io/)
|
||||||
# vpn_ip # virtual private network indicator
|
# vpn_ip # virtual private network indicator
|
||||||
# load # CPU load
|
# load # CPU load
|
||||||
# disk_usage # disk usage
|
# disk_usage # disk usage
|
||||||
|
@ -755,6 +756,12 @@
|
||||||
# Custom icon.
|
# Custom icon.
|
||||||
# typeset -g POWERLEVEL9K_NIX_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐'
|
# typeset -g POWERLEVEL9K_NIX_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐'
|
||||||
|
|
||||||
|
##################[ chezmoi_shell: chezmoi shell (https://www.chezmoi.io/) ]##################
|
||||||
|
# chezmoi shell color.
|
||||||
|
typeset -g POWERLEVEL9K_CHEZMOI_SHELL_FOREGROUND=33
|
||||||
|
# Custom icon.
|
||||||
|
# typeset -g POWERLEVEL9K_CHEZMOI_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐'
|
||||||
|
|
||||||
##################################[ disk_usage: disk usage ]##################################
|
##################################[ disk_usage: disk usage ]##################################
|
||||||
# Colors for different levels of disk usage.
|
# Colors for different levels of disk usage.
|
||||||
typeset -g POWERLEVEL9K_DISK_USAGE_NORMAL_FOREGROUND=35
|
typeset -g POWERLEVEL9K_DISK_USAGE_NORMAL_FOREGROUND=35
|
||||||
|
|
|
@ -87,6 +87,7 @@
|
||||||
vim_shell # vim shell indicator (:sh)
|
vim_shell # vim shell indicator (:sh)
|
||||||
midnight_commander # midnight commander shell (https://midnight-commander.org/)
|
midnight_commander # midnight commander shell (https://midnight-commander.org/)
|
||||||
nix_shell # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html)
|
nix_shell # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html)
|
||||||
|
chezmoi_shell # chezmoi shell (https://www.chezmoi.io/)
|
||||||
# vi_mode # vi mode (you don't need this if you've enabled prompt_char)
|
# vi_mode # vi mode (you don't need this if you've enabled prompt_char)
|
||||||
# vpn_ip # virtual private network indicator
|
# vpn_ip # virtual private network indicator
|
||||||
# load # CPU load
|
# load # CPU load
|
||||||
|
@ -789,6 +790,13 @@
|
||||||
# Custom icon.
|
# Custom icon.
|
||||||
# typeset -g POWERLEVEL9K_NIX_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐'
|
# typeset -g POWERLEVEL9K_NIX_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐'
|
||||||
|
|
||||||
|
##################[ chezmoi_shell: chezmoi shell (https://www.chezmoi.io/) ]##################
|
||||||
|
# chezmoi shell color.
|
||||||
|
typeset -g POWERLEVEL9K_CHEZMOI_SHELL_FOREGROUND=0
|
||||||
|
typeset -g POWERLEVEL9K_CHEZMOI_SHELL_BACKGROUND=4
|
||||||
|
# Custom icon.
|
||||||
|
# typeset -g POWERLEVEL9K_CHEZMOI_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐'
|
||||||
|
|
||||||
##################################[ disk_usage: disk usage ]##################################
|
##################################[ disk_usage: disk usage ]##################################
|
||||||
# Colors for different levels of disk usage.
|
# Colors for different levels of disk usage.
|
||||||
typeset -g POWERLEVEL9K_DISK_USAGE_NORMAL_FOREGROUND=3
|
typeset -g POWERLEVEL9K_DISK_USAGE_NORMAL_FOREGROUND=3
|
||||||
|
|
|
@ -107,6 +107,7 @@ function _p9k_init_icons() {
|
||||||
VCS_SVN_ICON 'svn'$q
|
VCS_SVN_ICON 'svn'$q
|
||||||
RUST_ICON 'R'
|
RUST_ICON 'R'
|
||||||
PYTHON_ICON '\uE63C'$s # (doesn't always work)
|
PYTHON_ICON '\uE63C'$s # (doesn't always work)
|
||||||
|
CHEZMOI_ICON '\uE12C'$s #
|
||||||
SWIFT_ICON 'Swift'
|
SWIFT_ICON 'Swift'
|
||||||
GO_ICON 'Go'
|
GO_ICON 'Go'
|
||||||
GOLANG_ICON 'Go'
|
GOLANG_ICON 'Go'
|
||||||
|
@ -243,6 +244,7 @@ function _p9k_init_icons() {
|
||||||
VCS_SVN_ICON 'svn'$q
|
VCS_SVN_ICON 'svn'$q
|
||||||
RUST_ICON '\uE6A8' #
|
RUST_ICON '\uE6A8' #
|
||||||
PYTHON_ICON '\uE63C'$s #
|
PYTHON_ICON '\uE63C'$s #
|
||||||
|
CHEZMOI_ICON '\uF015'$s #
|
||||||
SWIFT_ICON 'Swift'
|
SWIFT_ICON 'Swift'
|
||||||
GO_ICON 'Go'
|
GO_ICON 'Go'
|
||||||
GOLANG_ICON 'Go'
|
GOLANG_ICON 'Go'
|
||||||
|
@ -384,6 +386,7 @@ function _p9k_init_icons() {
|
||||||
VCS_SVN_ICON 'svn'$q
|
VCS_SVN_ICON 'svn'$q
|
||||||
RUST_ICON '\uE6A8' #
|
RUST_ICON '\uE6A8' #
|
||||||
PYTHON_ICON '\U1F40D' # 🐍
|
PYTHON_ICON '\U1F40D' # 🐍
|
||||||
|
CHEZMOI_ICON "${CODEPOINT_OF_AWESOME_HOME:+\\u$CODEPOINT_OF_AWESOME_HOME$s}"
|
||||||
SWIFT_ICON '\uE655'$s #
|
SWIFT_ICON '\uE655'$s #
|
||||||
PUBLIC_IP_ICON "${CODEPOINT_OF_AWESOME_GLOBE:+\\u$CODEPOINT_OF_AWESOME_GLOBE$s}"
|
PUBLIC_IP_ICON "${CODEPOINT_OF_AWESOME_GLOBE:+\\u$CODEPOINT_OF_AWESOME_GLOBE$s}"
|
||||||
LOCK_ICON "${CODEPOINT_OF_AWESOME_LOCK:+\\u$CODEPOINT_OF_AWESOME_LOCK}"
|
LOCK_ICON "${CODEPOINT_OF_AWESOME_LOCK:+\\u$CODEPOINT_OF_AWESOME_LOCK}"
|
||||||
|
@ -519,6 +522,7 @@ function _p9k_init_icons() {
|
||||||
VCS_SVN_ICON '\uE72D'$q #
|
VCS_SVN_ICON '\uE72D'$q #
|
||||||
RUST_ICON '\uE7A8'$q #
|
RUST_ICON '\uE7A8'$q #
|
||||||
PYTHON_ICON '\UE73C ' #
|
PYTHON_ICON '\UE73C ' #
|
||||||
|
CHEZMOI_ICON '\uF015'$s #
|
||||||
SWIFT_ICON '\uE755' #
|
SWIFT_ICON '\uE755' #
|
||||||
GO_ICON '\uE626' #
|
GO_ICON '\uE626' #
|
||||||
GOLANG_ICON '\uE626' #
|
GOLANG_ICON '\uE626' #
|
||||||
|
@ -656,6 +660,7 @@ function _p9k_init_icons() {
|
||||||
VCS_SVN_ICON '\uE72D'$q #
|
VCS_SVN_ICON '\uE72D'$q #
|
||||||
RUST_ICON '\uE7A8'$q #
|
RUST_ICON '\uE7A8'$q #
|
||||||
PYTHON_ICON '\UE73C ' #
|
PYTHON_ICON '\UE73C ' #
|
||||||
|
CHEZMOI_ICON '\uF015'$s #
|
||||||
SWIFT_ICON '\uE755' #
|
SWIFT_ICON '\uE755' #
|
||||||
GO_ICON '\uE626' #
|
GO_ICON '\uE626' #
|
||||||
GOLANG_ICON '\uE626' #
|
GOLANG_ICON '\uE626' #
|
||||||
|
@ -790,6 +795,7 @@ function _p9k_init_icons() {
|
||||||
VCS_SVN_ICON ''
|
VCS_SVN_ICON ''
|
||||||
RUST_ICON 'rust'
|
RUST_ICON 'rust'
|
||||||
PYTHON_ICON 'py'
|
PYTHON_ICON 'py'
|
||||||
|
CHEZMOI_ICON 'chezmoi'
|
||||||
SWIFT_ICON 'swift'
|
SWIFT_ICON 'swift'
|
||||||
GO_ICON 'go'
|
GO_ICON 'go'
|
||||||
GOLANG_ICON 'go'
|
GOLANG_ICON 'go'
|
||||||
|
@ -926,6 +932,7 @@ function _p9k_init_icons() {
|
||||||
VCS_SVN_ICON ''
|
VCS_SVN_ICON ''
|
||||||
RUST_ICON 'R'
|
RUST_ICON 'R'
|
||||||
PYTHON_ICON 'Py'
|
PYTHON_ICON 'Py'
|
||||||
|
CHEZMOI_ICON 'Chez'
|
||||||
SWIFT_ICON 'Swift'
|
SWIFT_ICON 'Swift'
|
||||||
GO_ICON 'Go'
|
GO_ICON 'Go'
|
||||||
GOLANG_ICON 'Go'
|
GOLANG_ICON 'Go'
|
||||||
|
|
|
@ -4260,6 +4260,19 @@ instant_prompt_vi_mode() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Chezmoi shell indicator: https://www.chezmoi.io/
|
||||||
|
prompt_chezmoi_shell() {
|
||||||
|
_p9k_prompt_segment $0 blue $_p9k_color1 CHEZMOI_ICON 0 '' ''
|
||||||
|
}
|
||||||
|
|
||||||
|
_p9k_prompt_chezmoi_shell_init() {
|
||||||
|
typeset -g "_p9k__segment_cond_${_p9k__prompt_side}[_p9k__segment_index]"='$CHEZMOI'
|
||||||
|
}
|
||||||
|
|
||||||
|
function instant_prompt_chezmoi_shell() {
|
||||||
|
_p9k_prompt_segment prompt_chezmoi_shell blue $_p9k_color1 CHEZMOI_ICON 1 '$CHEZMOI_ICON' ''
|
||||||
|
}
|
||||||
|
|
||||||
################################################################
|
################################################################
|
||||||
# Virtualenv: current working virtualenv
|
# Virtualenv: current working virtualenv
|
||||||
# More information on virtualenv (Python):
|
# More information on virtualenv (Python):
|
||||||
|
@ -5071,8 +5084,11 @@ function _p9k_timewarrior_clear() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function prompt_timewarrior() {
|
function prompt_timewarrior() {
|
||||||
|
local dir
|
||||||
|
[[ -n ${dir::=$TIMEWARRIORDB} || -n ${dir::=~/.timewarrior}(#qN/) ]] ||
|
||||||
|
dir=${XDG_DATA_HOME:-~/.local/share}/timewarrior
|
||||||
|
dir+=/data
|
||||||
local -a stat
|
local -a stat
|
||||||
local dir=${TIMEWARRIORDB:-~/.timewarrior}/data
|
|
||||||
[[ $dir == $_p9k_timewarrior_dir ]] || _p9k_timewarrior_clear
|
[[ $dir == $_p9k_timewarrior_dir ]] || _p9k_timewarrior_clear
|
||||||
if [[ -n $_p9k_timewarrior_file_name ]]; then
|
if [[ -n $_p9k_timewarrior_file_name ]]; then
|
||||||
zstat -A stat +mtime -- $dir $_p9k_timewarrior_file_name 2>/dev/null || stat=()
|
zstat -A stat +mtime -- $dir $_p9k_timewarrior_file_name 2>/dev/null || stat=()
|
||||||
|
|
Loading…
Reference in New Issue