diff options
| author | TheSiahxyz <164138827+TheSiahxyz@users.noreply.github.com> | 2026-01-17 01:59:04 +0900 |
|---|---|---|
| committer | TheSiahxyz <164138827+TheSiahxyz@users.noreply.github.com> | 2026-01-17 01:59:04 +0900 |
| commit | dc0b81078a2d043a3a9a75b499a8f7d8cf5d2098 (patch) | |
| tree | 65800815adcf168d2cae46dacf6ddc25dbed7fb2 /ar | |
| parent | 3a1d03e01b3e666a67da19bd1595b8cd5074b26a (diff) | |
modified zsh/.zshrc
Diffstat (limited to 'ar')
| -rw-r--r-- | ar/.config/zsh/.zshrc | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/ar/.config/zsh/.zshrc b/ar/.config/zsh/.zshrc index 12fa76a..7da0212 100644 --- a/ar/.config/zsh/.zshrc +++ b/ar/.config/zsh/.zshrc @@ -21,24 +21,29 @@ zstyle ':vcs_info:git*+set-message:*' hooks git-untracked git-behind-upstream gi fi } +vi-git-behind-upstream() { - if [[ $(git rev-list HEAD..$(git rev-parse --abbrev-ref @{upstream}) --count) -gt 0 ]]; then + local upstream=$(git rev-parse --abbrev-ref @{upstream} 2>/dev/null) + if [[ -n "$upstream" ]] && [[ $(git rev-list HEAD..$upstream --count 2>/dev/null) -gt 0 +]]; then hook_com[misc]+="%{$fg[red]%}<" fi } +vi-git-ahead-upstream() { - if [[ $(git rev-list $(git rev-parse --abbrev-ref @{upstream})..HEAD --count) -gt 0 ]]; then + local upstream=$(git rev-parse --abbrev-ref @{upstream} 2>/dev/null) + if [[ -n "$upstream" ]] && [[ $(git rev-list $upstream..HEAD --count 2>/dev/null) -gt 0 +]]; then hook_com[misc]+="%{$fg[green]%}>" fi } +vi-git-diverged-upstream() { - local ahead_count=$(git rev-list --count $(git rev-parse --abbrev-ref @{upstream})..HEAD 2>/dev/null) - local behind_count=$(git rev-list --count HEAD..$(git rev-parse --abbrev-ref @{upstream}) 2>/dev/null) + local upstream=$(git rev-parse --abbrev-ref @{upstream} 2>/dev/null) + [[ -z "$upstream" ]] && return + local ahead_count=$(git rev-list --count $upstream..HEAD 2>/dev/null) + local behind_count=$(git rev-list --count HEAD..$upstream 2>/dev/null) if [[ "$ahead_count" -gt 0 && "$behind_count" -gt 0 ]]; then hook_com[misc]+="%{$fg[white]%}<>" fi } - ### --- ZSH --- ### # GnuPG unset SSH_AGENT_PID @@ -114,20 +119,6 @@ zstyle ':fzf-tab:*' switch-group ',' '.' # switch group using `,` and `.` [ -f "${XDG_CONFIG_HOME:-${HOME}/.config}/shell/zshnameddirrc" ] && source "${XDG_CONFIG_HOME:-${HOME}/.config}/shell/zshnameddirrc" -### --- AVANTE --- ### -export AVANTE_ANTHROPIC_API_KEY="$(pass show api/claude/nvim | head -n1)" -export AVANTE_OPENAI_API_KEY="$(pass show api/chatGPT/nvim | head -n1)" -# export AVANTE_AZURE_OPENAI_API_KEY="$(pass show api/azure/nvim | head -n1)" -# export AVANTE_GEMINI_API_KEY="$(pass show api/gemini/nvim | head -n1)" -# export AVANTE_CO_API_KEY="$(pass show api/cohere/nvim | head -n1)" -# export AVANTE_AIHUBMIX_API_KEY="$(pass show api/aihubmix/nvim | head -n1)" -# export AVANTE_MOONSHOT_API_KEY="$(pass show api/moonshot/nvim | head -n1)" - - -### --- OPENAI --- ### -export OPENAI_API_KEY="$(pass show api/chatGPT/nvim | head -n1)" - - ## --- TMUX --- ### if command -v tmux >/dev/null 2>&1 && [ -z "$TMUX" ]; then terminal_count=$(pgrep -u "$USER" -ax "${TERMINAL:-st}" | grep -Ev 'ncmpcpp|newsboat|pulsemixer|spterm|splf|spcalc|stig|vimwikitodo' | wc -l) |