mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-11-22 12:20:07 +00:00
Merge OS detection & segment into next
This commit is contained in:
commit
c044ae78a5
2 changed files with 116 additions and 78 deletions
|
@ -233,6 +233,7 @@ currently available are:
|
||||||
* **dir** - Your current working directory.
|
* **dir** - Your current working directory.
|
||||||
* **history** - The command number for the current line.
|
* **history** - The command number for the current line.
|
||||||
* **node_version** - Show the version number of the installed Node.js.
|
* **node_version** - Show the version number of the installed Node.js.
|
||||||
|
* **os_icon** - Display a nice little icon, depending on your operating system.
|
||||||
* **rbenv** - Ruby environment information (if one is active).
|
* **rbenv** - Ruby environment information (if one is active).
|
||||||
* **rspec_stats** - Show a ratio of test classes vs code classes for RSpec.
|
* **rspec_stats** - Show a ratio of test classes vs code classes for RSpec.
|
||||||
* **status** - The return code of the previous command, and status of background jobs.
|
* **status** - The return code of the previous command, and status of background jobs.
|
||||||
|
|
|
@ -44,6 +44,11 @@
|
||||||
#zstyle ':vcs_info:*+*:*' debug true
|
#zstyle ':vcs_info:*+*:*' debug true
|
||||||
#set -o xtrace
|
#set -o xtrace
|
||||||
|
|
||||||
|
# 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'
|
||||||
|
|
||||||
# These characters require the Powerline fonts to work properly. If see boxes or
|
# These characters require the Powerline fonts to work properly. If see boxes or
|
||||||
# bizarre characters below, your fonts are not correctly installed. If you
|
# bizarre characters below, your fonts are not correctly installed. If you
|
||||||
# do not want to install a special font, you can set `POWERLEVEL9K_MODE` to
|
# do not want to install a special font, you can set `POWERLEVEL9K_MODE` to
|
||||||
|
@ -54,117 +59,144 @@ case $POWERLEVEL9K_MODE in
|
||||||
# See https://github.com/gabrielelana/awesome-terminal-fonts/tree/patching-strategy/patched
|
# See https://github.com/gabrielelana/awesome-terminal-fonts/tree/patching-strategy/patched
|
||||||
LEFT_SEGMENT_SEPARATOR=''
|
LEFT_SEGMENT_SEPARATOR=''
|
||||||
RIGHT_SEGMENT_SEPARATOR=''
|
RIGHT_SEGMENT_SEPARATOR=''
|
||||||
ROOT_ICON="\uE801" #
|
ROOT_ICON="\UE801" #
|
||||||
RUBY_ICON="\uE847" #
|
RUBY_ICON="\UE847" #
|
||||||
AWS_ICON="\uE895" #
|
AWS_ICON="\UE895" #
|
||||||
BACKGROUND_JOBS_ICON="\uE82F " #
|
BACKGROUND_JOBS_ICON="\UE82F " #
|
||||||
TEST_ICON="\uE891" #
|
TEST_ICON="\UE891" #
|
||||||
OK_ICON="\u2713" # ✓
|
OK_ICON="\U2713" # ✓
|
||||||
FAIL_ICON="\u2718" # ✘
|
FAIL_ICON="\U2718" # ✘
|
||||||
SYMFONY_ICON="SF"
|
SYMFONY_ICON="SF"
|
||||||
VCS_UNTRACKED_ICON="\uE16C" #
|
APPLE_ICON=$'\UF8FF' #
|
||||||
VCS_UNSTAGED_ICON="\uE17C" #
|
FREEBSD_ICON=$'\U1F608 ' # 😈
|
||||||
VCS_STAGED_ICON="\uE168" #
|
LINUX_ICON=$'\U1F427 ' # 🐧
|
||||||
VCS_STASH_ICON="\uE133 " #
|
SUNOS_ICON=$'\U1F31E ' # 🌞
|
||||||
#VCS_INCOMING_CHANGES="\uE1EB " #
|
VCS_UNTRACKED_ICON="\UE16C" #
|
||||||
#VCS_INCOMING_CHANGES="\uE80D " #
|
VCS_UNSTAGED_ICON="\UE17C" #
|
||||||
VCS_INCOMING_CHANGES="\uE131 " #
|
VCS_STAGED_ICON="\UE168" #
|
||||||
#VCS_OUTGOING_CHANGES="\uE1EC " #
|
VCS_STASH_ICON="\UE133 " #
|
||||||
#VCS_OUTGOING_CHANGES="\uE80E " #
|
#VCS_INCOMING_CHANGES="\UE1EB " #
|
||||||
VCS_OUTGOING_CHANGES="\uE132 " #
|
#VCS_INCOMING_CHANGES="\UE80D " #
|
||||||
VCS_TAG_ICON="\uE817 " #
|
VCS_INCOMING_CHANGES="\UE131 " #
|
||||||
VCS_BOOKMARK_ICON="\uE87B" #
|
#VCS_OUTGOING_CHANGES="\UE1EC " #
|
||||||
VCS_COMMIT_ICON="\uE821 " #
|
#VCS_OUTGOING_CHANGES="\UE80E " #
|
||||||
VCS_BRANCH_ICON="\uE220" #
|
VCS_OUTGOING_CHANGES="\UE132 " #
|
||||||
VCS_REMOTE_BRANCH_ICON=" \uE804 " #
|
VCS_TAG_ICON="\UE817 " #
|
||||||
VCS_GIT_ICON="\uE20E " #
|
VCS_BOOKMARK_ICON="\UE87B" #
|
||||||
VCS_HG_ICON="\uE1C3 " #
|
VCS_COMMIT_ICON="\UE821 " #
|
||||||
|
VCS_BRANCH_ICON=$'\UE220' #
|
||||||
|
VCS_REMOTE_BRANCH_ICON=" \UE804 " #
|
||||||
|
VCS_GIT_ICON="\UE20E " #
|
||||||
|
VCS_HG_ICON="\UE1C3 " #
|
||||||
;;
|
;;
|
||||||
'compatible')
|
'compatible')
|
||||||
LEFT_SEGMENT_SEPARATOR="\u2B80" # ⮀
|
LEFT_SEGMENT_SEPARATOR="\U2B80" # ⮀
|
||||||
RIGHT_SEGMENT_SEPARATOR="\u2B82" # ⮂
|
RIGHT_SEGMENT_SEPARATOR="\U2B82" # ⮂
|
||||||
ROOT_ICON="\u26A1" # ⚡
|
ROOT_ICON="\U26A1" # ⚡
|
||||||
RUBY_ICON=''
|
RUBY_ICON=''
|
||||||
AWS_ICON="AWS:"
|
AWS_ICON="AWS:"
|
||||||
BACKGROUND_JOBS_ICON="\u2699" # ⚙
|
BACKGROUND_JOBS_ICON="\U2699" # ⚙
|
||||||
TEST_ICON=''
|
TEST_ICON=''
|
||||||
OK_ICON="\u2713" # ✓
|
OK_ICON="\U2713" # ✓
|
||||||
FAIL_ICON="\u2718" # ✘
|
FAIL_ICON="\U2718" # ✘
|
||||||
SYMFONY_ICON="SF"
|
SYMFONY_ICON="SF"
|
||||||
|
APPLE_ICON='OSX'
|
||||||
|
FREEBSD_ICON='BSD'
|
||||||
|
LINUX_ICON='Lx'
|
||||||
|
SUNOS_ICON='Sun'
|
||||||
VCS_UNTRACKED_ICON='?'
|
VCS_UNTRACKED_ICON='?'
|
||||||
VCS_UNSTAGED_ICON="\u25CF" # ●
|
VCS_UNSTAGED_ICON="\U25CF" # ●
|
||||||
VCS_STAGED_ICON="\u271A" # ✚
|
VCS_STAGED_ICON="\U271A" # ✚
|
||||||
VCS_STASH_ICON="\u235F" # ⍟
|
VCS_STASH_ICON="\U235F" # ⍟
|
||||||
VCS_INCOMING_CHANGES="\u2193" # ↓
|
VCS_INCOMING_CHANGES="\U2193" # ↓
|
||||||
VCS_OUTGOING_CHANGES="\u2191" # ↑
|
VCS_OUTGOING_CHANGES="\U2191" # ↑
|
||||||
VCS_TAG_ICON=''
|
VCS_TAG_ICON=''
|
||||||
VCS_BOOKMARK_ICON="\u263F" # ☿
|
VCS_BOOKMARK_ICON="\U263F" # ☿
|
||||||
VCS_COMMIT_ICON=''
|
VCS_COMMIT_ICON=''
|
||||||
VCS_BRANCH_ICON='@'
|
VCS_BRANCH_ICON='@'
|
||||||
VCS_REMOTE_BRANCH_ICON="\u2192" # →
|
VCS_REMOTE_BRANCH_ICON="\U2192" # →
|
||||||
VCS_GIT_ICON='Git'
|
VCS_GIT_ICON='Git'
|
||||||
VCS_HG_ICON='HG'
|
VCS_HG_ICON='HG'
|
||||||
;;
|
;;
|
||||||
'awesome-patched')
|
'awesome-patched')
|
||||||
# Awesome-Patched Font required!
|
# Awesome-Patched Font required!
|
||||||
# See https://github.com/gabrielelana/awesome-terminal-fonts/tree/patching-strategy/patched
|
# See https://github.com/gabrielelana/awesome-terminal-fonts/tree/patching-strategy/patched
|
||||||
LEFT_SEGMENT_SEPARATOR="\uE0B0" #
|
LEFT_SEGMENT_SEPARATOR="\UE0B0" #
|
||||||
RIGHT_SEGMENT_SEPARATOR="\uE0B2" #
|
RIGHT_SEGMENT_SEPARATOR="\UE0B2" #
|
||||||
ROOT_ICON="\u26A1" # ⚡
|
ROOT_ICON="\U26A1" # ⚡
|
||||||
RUBY_ICON="\uE847" #
|
RUBY_ICON="\UE847" #
|
||||||
AWS_ICON="\uE895" #
|
AWS_ICON="\UE895" #
|
||||||
BACKGROUND_JOBS_ICON="\uE82F " #
|
BACKGROUND_JOBS_ICON="\UE82F " #
|
||||||
TEST_ICON="\uE891" #
|
TEST_ICON="\UE891" #
|
||||||
OK_ICON="\u2713" # ✓
|
OK_ICON="\U2713" # ✓
|
||||||
FAIL_ICON="\u2718" # ✘
|
FAIL_ICON="\U2718" # ✘
|
||||||
SYMFONY_ICON="SF"
|
SYMFONY_ICON="SF"
|
||||||
VCS_UNTRACKED_ICON="\uE16C" #
|
APPLE_ICON=$'\UF8FF' #
|
||||||
VCS_UNSTAGED_ICON="\uE17C" #
|
FREEBSD_ICON=$'\U1F608 ' # 😈
|
||||||
VCS_STAGED_ICON="\uE168" #
|
LINUX_ICON=$'\U1F427 ' # 🐧
|
||||||
VCS_STASH_ICON="\uE133 " #
|
SUNOS_ICON=$'\U1F31E ' # 🌞
|
||||||
#VCS_INCOMING_CHANGES="\uE1EB " #
|
VCS_UNTRACKED_ICON="\UE16C" #
|
||||||
#VCS_INCOMING_CHANGES="\uE80D " #
|
VCS_UNSTAGED_ICON="\UE17C" #
|
||||||
VCS_INCOMING_CHANGES="\uE131 " #
|
VCS_STAGED_ICON="\UE168" #
|
||||||
#VCS_OUTGOING_CHANGES="\uE1EC " #
|
VCS_STASH_ICON="\UE133 " #
|
||||||
#VCS_OUTGOING_CHANGES="\uE80E " #
|
#VCS_INCOMING_CHANGES="\UE1EB " #
|
||||||
VCS_OUTGOING_CHANGES="\uE132 " #
|
#VCS_INCOMING_CHANGES="\UE80D " #
|
||||||
VCS_TAG_ICON="\uE817 " #
|
VCS_INCOMING_CHANGES="\UE131 " #
|
||||||
VCS_BOOKMARK_ICON="\uE87B" #
|
#VCS_OUTGOING_CHANGES="\UE1EC " #
|
||||||
VCS_COMMIT_ICON="\uE821 " #
|
#VCS_OUTGOING_CHANGES="\UE80E " #
|
||||||
VCS_BRANCH_ICON="\uE220" #
|
VCS_OUTGOING_CHANGES="\UE132 " #
|
||||||
VCS_REMOTE_BRANCH_ICON=" \uE804 " #
|
VCS_TAG_ICON="\UE817 " #
|
||||||
VCS_GIT_ICON="\uE20E " #
|
VCS_BOOKMARK_ICON="\UE87B" #
|
||||||
VCS_HG_ICON="\uE1C3 " #
|
VCS_COMMIT_ICON="\UE821 " #
|
||||||
|
VCS_BRANCH_ICON=$'\UE220' #
|
||||||
|
VCS_REMOTE_BRANCH_ICON=" \UE804 " #
|
||||||
|
VCS_GIT_ICON="\UE20E " #
|
||||||
|
VCS_HG_ICON="\UE1C3 " #
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
# Powerline-Patched Font required!
|
# Powerline-Patched Font required!
|
||||||
# See https://github.com/Lokaltog/powerline-fonts
|
# See https://github.com/Lokaltog/powerline-fonts
|
||||||
LEFT_SEGMENT_SEPARATOR="\uE0B0" #
|
LEFT_SEGMENT_SEPARATOR="\UE0B0" #
|
||||||
RIGHT_SEGMENT_SEPARATOR="\uE0B2" #
|
RIGHT_SEGMENT_SEPARATOR="\UE0B2" #
|
||||||
ROOT_ICON="\u26A1" # ⚡
|
ROOT_ICON="\U26A1" # ⚡
|
||||||
RUBY_ICON=''
|
RUBY_ICON=''
|
||||||
AWS_ICON="AWS:"
|
AWS_ICON="AWS:"
|
||||||
BACKGROUND_JOBS_ICON="\u2699" # ⚙
|
BACKGROUND_JOBS_ICON="\U2699" # ⚙
|
||||||
TEST_ICON=''
|
TEST_ICON=''
|
||||||
OK_ICON="\u2713" # ✓
|
OK_ICON="\U2713" # ✓
|
||||||
FAIL_ICON="\u2718" # ✘
|
FAIL_ICON="\U2718" # ✘
|
||||||
SYMFONY_ICON="SF"
|
SYMFONY_ICON="SF"
|
||||||
|
APPLE_ICON='OSX'
|
||||||
|
FREEBSD_ICON='BSD'
|
||||||
|
LINUX_ICON='Lx'
|
||||||
|
SUNOS_ICON='Sun'
|
||||||
VCS_UNTRACKED_ICON='?'
|
VCS_UNTRACKED_ICON='?'
|
||||||
VCS_UNSTAGED_ICON="\u25CF" # ●
|
VCS_UNSTAGED_ICON="\U25CF" # ●
|
||||||
VCS_STAGED_ICON="\u271A" # ✚
|
VCS_STAGED_ICON="\U271A" # ✚
|
||||||
VCS_STASH_ICON="\u235F" # ⍟
|
VCS_STASH_ICON="\U235F" # ⍟
|
||||||
VCS_INCOMING_CHANGES="\u2193" # ↓
|
VCS_INCOMING_CHANGES="\U2193" # ↓
|
||||||
VCS_OUTGOING_CHANGES="\u2191" # ↑
|
VCS_OUTGOING_CHANGES="\U2191" # ↑
|
||||||
VCS_TAG_ICON=''
|
VCS_TAG_ICON=''
|
||||||
VCS_BOOKMARK_ICON="\u263F" # ☿
|
VCS_BOOKMARK_ICON="\U263F" # ☿
|
||||||
VCS_COMMIT_ICON=''
|
VCS_COMMIT_ICON=''
|
||||||
VCS_BRANCH_ICON="\uE0A0 " #
|
VCS_BRANCH_ICON="\UE0A0 " #
|
||||||
VCS_REMOTE_BRANCH_ICON="\u2192" # →
|
VCS_REMOTE_BRANCH_ICON="\U2192" # →
|
||||||
VCS_GIT_ICON=""
|
VCS_GIT_ICON=""
|
||||||
VCS_HG_ICON=""
|
VCS_HG_ICON=""
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
# OS detection for the `os_icon` segment
|
||||||
|
case $(uname) in
|
||||||
|
Darwin) OS_ICON=$APPLE_ICON ;;
|
||||||
|
FreeBSD) OS_ICON=$FREEBSD_ICON ;;
|
||||||
|
OpenBSD) OS_ICON=$FREEBSD_ICON ;;
|
||||||
|
DragonFly) OS_ICON=$FREEBSD_ICON ;;
|
||||||
|
Linux) OS_ICON=$LINUX_ICON ;;
|
||||||
|
SunOS) OS_ICON=$SUNOS_ICON ;;
|
||||||
|
*) OS_ICON='' ;;
|
||||||
|
esac
|
||||||
|
|
||||||
if [[ "$POWERLEVEL9K_HIDE_BRANCH_ICON" == true ]]; then
|
if [[ "$POWERLEVEL9K_HIDE_BRANCH_ICON" == true ]]; then
|
||||||
VCS_BRANCH_ICON=''
|
VCS_BRANCH_ICON=''
|
||||||
fi
|
fi
|
||||||
|
@ -487,11 +519,16 @@ prompt_longstatus() {
|
||||||
prompt_node_version() {
|
prompt_node_version() {
|
||||||
local nvm_prompt=$(node -v 2>/dev/null)
|
local nvm_prompt=$(node -v 2>/dev/null)
|
||||||
[[ -z "${nvm_prompt}" ]] && return
|
[[ -z "${nvm_prompt}" ]] && return
|
||||||
NODE_ICON=$'\u2B22' # ⬢
|
NODE_ICON=$'\U2B22' # ⬢
|
||||||
|
|
||||||
$1_prompt_segment "$0" "green" "white" "${nvm_prompt:1} $NODE_ICON"
|
$1_prompt_segment "$0" "green" "white" "${nvm_prompt:1} $NODE_ICON"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# print a little OS icon
|
||||||
|
prompt_os_icon() {
|
||||||
|
$1_prompt_segment "$0" "008" "255" "$OS_ICON"
|
||||||
|
}
|
||||||
|
|
||||||
# rbenv information
|
# rbenv information
|
||||||
prompt_rbenv() {
|
prompt_rbenv() {
|
||||||
if [[ -n "$RBENV_VERSION" ]]; then
|
if [[ -n "$RBENV_VERSION" ]]; then
|
||||||
|
|
Loading…
Reference in a new issue