From f2e5e9e814cb860b005faeeddec2959768c0f559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 8 Jun 2022 18:05:18 +0200 Subject: zshrc: path to git-prompt on nixos --- zshrc.d/prompt | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/zshrc.d/prompt b/zshrc.d/prompt index 72cbf44..2f84536 100644 --- a/zshrc.d/prompt +++ b/zshrc.d/prompt @@ -8,14 +8,18 @@ PROMPT="%(?..%{$fg_bold[yellow]%}EXIT: %? )%{$fg_bold[$NCOLOR]%}%n@%m:%{$fg_bold[blue]%}%1~%{$fg_bold[$NCOLOR]%}%(!.#.$)%{$reset_color%} " unset NCOLOR -if [ -e /usr/share/git/git-prompt.sh ]; then - source /usr/share/git/git-prompt.sh - export GIT_PS1_SHOWCOLORHINTS=y - export GIT_PS1_SHOWDIRTYSTATE=y - export GIT_PS1_SHOWUNTRACKEDFILES=y - export GIT_PS1_SHOWUPSTREAM="auto" - export GIT_PS1_STATESEPARATOR="" - export GIT_PS1_SHOWUPSTREAM=y - export GIT_PS1_DESCRIBE_STYLE="branch" - RPROMPT='$(__git_ps1 "%s")' -fi +for gitprompt in "/usr/share/git/git-prompt.sh" "/run/current-system/sw/share/bash-completion/completions/git-prompt.sh"; do + if [ -e "$gitprompt" ]; then + source "$gitprompt" + export GIT_PS1_SHOWCOLORHINTS=y + export GIT_PS1_SHOWDIRTYSTATE=y + export GIT_PS1_SHOWUNTRACKEDFILES=y + export GIT_PS1_SHOWUPSTREAM="auto" + export GIT_PS1_STATESEPARATOR="" + export GIT_PS1_SHOWUPSTREAM=y + export GIT_PS1_DESCRIBE_STYLE="branch" + RPROMPT='$(__git_ps1 "%s")' + break + fi +done +unset gitprompt -- cgit v1.2.3