max/config
1
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

zsh: only print nix shell paths once

Browse source
This commit is contained in:
Max Headroom 2022-03-06 01:01:42 +01:00
parent b67ad29800
commit 5397db3d0e
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
config/zsh/prompt.zsh
View file

@ -19,13 +19,11 @@ delta_prompt_symbol() {
delta_prompt_nix_shell() { delta_prompt_nix_shell() {
if [[ -n "$IN_NIX3_SHELL" || -n "$IN_NIX_SHELL" ]]; then if [[ -n "$IN_NIX3_SHELL" || -n "$IN_NIX_SHELL" ]]; then
print -n " %F{cyan}>%F{blue}>%F{8}" print -Pn " %F{cyan}>%F{blue}>%F{8}"
tr : '\n' <<<$PATH | grep '^/nix/store' | while read storepath; do tr : '\n' <<<$PATH | grep '^/nix/store' | while read storepath; do
print -n " ${${storepath#*-}%/*}" print -n " ${${storepath#*-}%/*}"
done done
print -n '%f\n ' print -P '%f'
else
print -n ' '
fi fi
} }
@ -50,11 +48,10 @@ delta_prompt_init() {
fi fi
if [[ -n $SSH_CONNECTION ]]; then if [[ -n $SSH_CONNECTION ]]; then
PROMPT="$(delta_prompt_nix_shell)\$(delta_prompt_symbol \$? $symbol_color)Δ%f %F{8}$hostnamevar %c >%f " PROMPT=" \$(delta_prompt_symbol \$? $symbol_color)Δ%f %F{8}$hostnamevar %c >%f "
else else
PROMPT="$(delta_prompt_nix_shell)\$(delta_prompt_symbol \$? $symbol_color)Δ%f %F{8}%c >%f " PROMPT=" \$(delta_prompt_symbol \$? $symbol_color)Δ%f %F{8}%c >%f "
fi fi
unfunction delta_prompt_nix_shell
zstyle ':vcs_info:*' enable git zstyle ':vcs_info:*' enable git
zstyle ':vcs_info:*' use-simple true zstyle ':vcs_info:*' use-simple true
@ -62,6 +59,9 @@ delta_prompt_init() {
zstyle ':vcs_info:git*' actionformats '%b|%a' zstyle ':vcs_info:git*' actionformats '%b|%a'
zstyle ':vcs_info:*' max-exports 2 zstyle ':vcs_info:*' max-exports 2
delta_prompt_nix_shell
unfunction delta_prompt_nix_shell
} }
delta_prompt_git_status() { delta_prompt_git_status() {