mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-11-16 09:50:06 +00:00
Merge branch 'master' into next
This commit is contained in:
commit
eb2e1b0e96
2 changed files with 5 additions and 4 deletions
|
@ -437,8 +437,8 @@ POWERLEVEL9K_HOST_TEMPLATE="%2m"
|
||||||
|
|
||||||
By default, LOCAL hosts will show the host icon and remote hosts will show the SSH icon. You can override them by setting
|
By default, LOCAL hosts will show the host icon and remote hosts will show the SSH icon. You can override them by setting
|
||||||
```
|
```
|
||||||
POWERLEVEL9K_HOST_ICON="\uF109 " #
|
POWERLEVEL9K_HOST_ICON="\uF109 "
|
||||||
POWERLEVEL9K_SSH_ICON="\uF489 " #
|
POWERLEVEL9K_SSH_ICON="\uF489 "
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -695,7 +695,7 @@ set_default POWERLEVEL9K_DIR_PATH_SEPARATOR "/"
|
||||||
set_default POWERLEVEL9K_HOME_FOLDER_ABBREVIATION "~"
|
set_default POWERLEVEL9K_HOME_FOLDER_ABBREVIATION "~"
|
||||||
set_default POWERLEVEL9K_DIR_SHOW_WRITABLE false
|
set_default POWERLEVEL9K_DIR_SHOW_WRITABLE false
|
||||||
prompt_dir() {
|
prompt_dir() {
|
||||||
local current_path="$(print -P "%~")"
|
local current_path=$(pwd | sed -e "s,^$HOME,~,")
|
||||||
if [[ -n "$POWERLEVEL9K_SHORTEN_DIR_LENGTH" || "$POWERLEVEL9K_SHORTEN_STRATEGY" == "truncate_with_folder_marker" ]]; then
|
if [[ -n "$POWERLEVEL9K_SHORTEN_DIR_LENGTH" || "$POWERLEVEL9K_SHORTEN_STRATEGY" == "truncate_with_folder_marker" ]]; then
|
||||||
set_default POWERLEVEL9K_SHORTEN_DELIMITER $'\U2026'
|
set_default POWERLEVEL9K_SHORTEN_DELIMITER $'\U2026'
|
||||||
|
|
||||||
|
@ -1332,7 +1332,7 @@ powerlevel9k_vcs_init() {
|
||||||
prompt_vcs() {
|
prompt_vcs() {
|
||||||
VCS_WORKDIR_DIRTY=false
|
VCS_WORKDIR_DIRTY=false
|
||||||
VCS_WORKDIR_HALF_DIRTY=false
|
VCS_WORKDIR_HALF_DIRTY=false
|
||||||
current_state=""
|
local current_state=""
|
||||||
|
|
||||||
# Actually invoke vcs_info manually to gather all information.
|
# Actually invoke vcs_info manually to gather all information.
|
||||||
vcs_info
|
vcs_info
|
||||||
|
@ -1451,6 +1451,7 @@ prompt_dropbox() {
|
||||||
# Main prompt
|
# Main prompt
|
||||||
build_left_prompt() {
|
build_left_prompt() {
|
||||||
local index=1
|
local index=1
|
||||||
|
local element
|
||||||
for element in "${POWERLEVEL9K_LEFT_PROMPT_ELEMENTS[@]}"; do
|
for element in "${POWERLEVEL9K_LEFT_PROMPT_ELEMENTS[@]}"; do
|
||||||
# Remove joined information in direct calls
|
# Remove joined information in direct calls
|
||||||
element=${element%_joined}
|
element=${element%_joined}
|
||||||
|
|
Loading…
Reference in a new issue