mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-10-16 11:40:46 +00:00
Compare commits
15 commits
d76926388a
...
6772fc62d0
Author | SHA1 | Date | |
---|---|---|---|
|
6772fc62d0 | ||
|
1514145a09 | ||
|
99e2c31484 | ||
|
e52598a5cc | ||
|
d91944d47e | ||
|
865291cb7a | ||
|
b7920c7433 | ||
|
97a28fcaf7 | ||
|
fbccfe80fd | ||
|
51d999651d | ||
|
3c307e8479 | ||
|
61af29b967 | ||
|
1ff9752c26 | ||
|
f2eb7138bc | ||
|
461a18abf6 |
9 changed files with 170 additions and 57 deletions
12
lib/git.zsh
12
lib/git.zsh
|
@ -162,6 +162,18 @@ function git_current_branch() {
|
||||||
echo ${ref#refs/heads/}
|
echo ${ref#refs/heads/}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Outputs the name of the previously checked out branch
|
||||||
|
# Usage example: git pull origin $(git_current_branch)
|
||||||
|
# rev-parse --symbolic-full-name @{-1} only prints if it is a branch
|
||||||
|
function git_previous_branch() {
|
||||||
|
local ref
|
||||||
|
ref=$(__git_prompt_git rev-parse --quiet --symbolic-full-name @{-1} 2> /dev/null)
|
||||||
|
local ret=$?
|
||||||
|
if [[ $ret != 0 ]] || [[ -z $ref ]]; then
|
||||||
|
return # no git repo or non-branch previous ref
|
||||||
|
fi
|
||||||
|
echo ${ref#refs/heads/}
|
||||||
|
}
|
||||||
|
|
||||||
# Gets the number of commits ahead from remote
|
# Gets the number of commits ahead from remote
|
||||||
function git_commits_ahead() {
|
function git_commits_ahead() {
|
||||||
|
|
|
@ -42,6 +42,8 @@ as you want:
|
||||||
zstyle ':omz:plugins:nvm' lazy-cmd eslint prettier typescript ...
|
zstyle ':omz:plugins:nvm' lazy-cmd eslint prettier typescript ...
|
||||||
```
|
```
|
||||||
|
|
||||||
|
There will be a function `_omz_nvm_load` available to load `nvm` without executing any other trigger command.
|
||||||
|
|
||||||
#### `.nvmrc` autoload
|
#### `.nvmrc` autoload
|
||||||
|
|
||||||
Note: _if used at the same time as `lazy`, `autoload` will start working only after nvm has been lazy-loaded_
|
Note: _if used at the same time as `lazy`, `autoload` will start working only after nvm has been lazy-loaded_
|
||||||
|
|
|
@ -20,7 +20,7 @@ if [[ -z "$NVM_DIR" ]] || [[ ! -f "$NVM_DIR/nvm.sh" ]]; then
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
function _omz_load_nvm_completion {
|
function _omz_nvm_setup_completion {
|
||||||
local _nvm_completion
|
local _nvm_completion
|
||||||
# Load nvm bash completion
|
# Load nvm bash completion
|
||||||
for _nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do
|
for _nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do
|
||||||
|
@ -33,12 +33,12 @@ function _omz_load_nvm_completion {
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
unfunction _omz_load_nvm_completion
|
unfunction _omz_nvm_setup_completion
|
||||||
}
|
}
|
||||||
|
|
||||||
function _omz_setup_autoload {
|
function _omz_nvm_setup_autoload {
|
||||||
if ! zstyle -t ':omz:plugins:nvm' autoload; then
|
if ! zstyle -t ':omz:plugins:nvm' autoload; then
|
||||||
unfunction _omz_setup_autoload
|
unfunction _omz_nvm_setup_autoload
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -68,13 +68,13 @@ function _omz_setup_autoload {
|
||||||
add-zsh-hook chpwd load-nvmrc
|
add-zsh-hook chpwd load-nvmrc
|
||||||
|
|
||||||
load-nvmrc
|
load-nvmrc
|
||||||
unfunction _omz_setup_autoload
|
unfunction _omz_nvm_setup_autoload
|
||||||
}
|
}
|
||||||
|
|
||||||
if zstyle -t ':omz:plugins:nvm' lazy; then
|
if zstyle -t ':omz:plugins:nvm' lazy; then
|
||||||
# Call nvm when first using nvm, node, npm, pnpm, yarn, corepack or other commands in lazy-cmd
|
# Call nvm when first using nvm, node, npm, pnpm, yarn, corepack or other commands in lazy-cmd
|
||||||
zstyle -a ':omz:plugins:nvm' lazy-cmd nvm_lazy_cmd
|
zstyle -a ':omz:plugins:nvm' lazy-cmd nvm_lazy_cmd
|
||||||
nvm_lazy_cmd=(nvm node npm npx pnpm pnpx yarn corepack $nvm_lazy_cmd) # default values
|
nvm_lazy_cmd=(_omz_nvm_load nvm node npm npx pnpm pnpx yarn corepack $nvm_lazy_cmd) # default values
|
||||||
eval "
|
eval "
|
||||||
function $nvm_lazy_cmd {
|
function $nvm_lazy_cmd {
|
||||||
for func in $nvm_lazy_cmd; do
|
for func in $nvm_lazy_cmd; do
|
||||||
|
@ -84,14 +84,16 @@ if zstyle -t ':omz:plugins:nvm' lazy; then
|
||||||
done
|
done
|
||||||
# Load nvm if it exists in \$NVM_DIR
|
# Load nvm if it exists in \$NVM_DIR
|
||||||
[[ -f \"\$NVM_DIR/nvm.sh\" ]] && source \"\$NVM_DIR/nvm.sh\"
|
[[ -f \"\$NVM_DIR/nvm.sh\" ]] && source \"\$NVM_DIR/nvm.sh\"
|
||||||
_omz_load_nvm_completion
|
_omz_nvm_setup_completion
|
||||||
_omz_setup_autoload
|
_omz_nvm_setup_autoload
|
||||||
|
if [[ \"\$0\" != _omz_nvm_load ]]; then
|
||||||
\"\$0\" \"\$@\"
|
\"\$0\" \"\$@\"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
"
|
"
|
||||||
unset nvm_lazy_cmd
|
unset nvm_lazy_cmd
|
||||||
else
|
else
|
||||||
source "$NVM_DIR/nvm.sh"
|
source "$NVM_DIR/nvm.sh"
|
||||||
_omz_load_nvm_completion
|
_omz_nvm_setup_completion
|
||||||
_omz_setup_autoload
|
_omz_nvm_setup_autoload
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -16,9 +16,10 @@ plugins=(... terraform)
|
||||||
## Aliases
|
## Aliases
|
||||||
|
|
||||||
| Alias | Command |
|
| Alias | Command |
|
||||||
|--------|----------------------------|
|
|---------|----------------------------------|
|
||||||
| `tf` | `terraform` |
|
| `tf` | `terraform` |
|
||||||
| `tfa` | `terraform apply` |
|
| `tfa` | `terraform apply` |
|
||||||
|
| `tfaa` | `terraform apply -auto-approve` |
|
||||||
| `tfc` | `terraform console` |
|
| `tfc` | `terraform console` |
|
||||||
| `tfd` | `terraform destroy` |
|
| `tfd` | `terraform destroy` |
|
||||||
| `tff` | `terraform fmt` |
|
| `tff` | `terraform fmt` |
|
||||||
|
|
|
@ -17,6 +17,7 @@ function tf_version_prompt_info() {
|
||||||
|
|
||||||
alias tf='terraform'
|
alias tf='terraform'
|
||||||
alias tfa='terraform apply'
|
alias tfa='terraform apply'
|
||||||
|
alias tfaa='terraform apply -auto-approve'
|
||||||
alias tfc='terraform console'
|
alias tfc='terraform console'
|
||||||
alias tfd='terraform destroy'
|
alias tfd='terraform destroy'
|
||||||
alias tff='terraform fmt'
|
alias tff='terraform fmt'
|
||||||
|
|
|
@ -51,6 +51,7 @@ Available search contexts are:
|
||||||
| `packagist` | `https://packagist.org/?query=` |
|
| `packagist` | `https://packagist.org/?query=` |
|
||||||
| `gopkg` | `https://pkg.go.dev/search?m=package&q=` |
|
| `gopkg` | `https://pkg.go.dev/search?m=package&q=` |
|
||||||
| `chatgpt` | `https://chatgpt.com/?q=` |
|
| `chatgpt` | `https://chatgpt.com/?q=` |
|
||||||
|
| `reddit` | `https://www.reddit.com/search/?q=` |
|
||||||
|
|
||||||
Also there are aliases for bang-searching DuckDuckGo:
|
Also there are aliases for bang-searching DuckDuckGo:
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,7 @@ function web_search() {
|
||||||
packagist "https://packagist.org/?query="
|
packagist "https://packagist.org/?query="
|
||||||
gopkg "https://pkg.go.dev/search?m=package&q="
|
gopkg "https://pkg.go.dev/search?m=package&q="
|
||||||
chatgpt "https://chatgpt.com/?q="
|
chatgpt "https://chatgpt.com/?q="
|
||||||
|
reddit "https://www.reddit.com/search/?q="
|
||||||
)
|
)
|
||||||
|
|
||||||
# check whether the search engine is supported
|
# check whether the search engine is supported
|
||||||
|
@ -85,6 +86,7 @@ alias npmpkg='web_search npmpkg'
|
||||||
alias packagist='web_search packagist'
|
alias packagist='web_search packagist'
|
||||||
alias gopkg='web_search gopkg'
|
alias gopkg='web_search gopkg'
|
||||||
alias chatgpt='web_search chatgpt'
|
alias chatgpt='web_search chatgpt'
|
||||||
|
alias reddit='web_search reddit'
|
||||||
|
|
||||||
#add your own !bang searches here
|
#add your own !bang searches here
|
||||||
alias wiki='web_search duckduckgo \!w'
|
alias wiki='web_search duckduckgo \!w'
|
||||||
|
|
|
@ -39,6 +39,63 @@ case ${SOLARIZED_THEME:-dark} in
|
||||||
*) CURRENT_FG='black';;
|
*) CURRENT_FG='black';;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
### Theme Configuration Initialization
|
||||||
|
#
|
||||||
|
# Override these settings in your ~/.zshrc
|
||||||
|
|
||||||
|
# Current working directory
|
||||||
|
: ${AGNOSTER_DIR_FG:=${CURRENT_FG}}
|
||||||
|
: ${AGNOSTER_DIR_BG:=blue}
|
||||||
|
|
||||||
|
# user@host
|
||||||
|
: ${AGNOSTER_CONTEXT_FG:=default}
|
||||||
|
: ${AGNOSTER_CONTEXT_BG:=black}
|
||||||
|
|
||||||
|
# Git related
|
||||||
|
: ${AGNOSTER_GIT_CLEAN_FG:=${CURRENT_FG}}
|
||||||
|
: ${AGNOSTER_GIT_CLEAN_BG:=green}
|
||||||
|
: ${AGNOSTER_GIT_DIRTY_FG:=black}
|
||||||
|
: ${AGNOSTER_GIT_DIRTY_BG:=yellow}
|
||||||
|
|
||||||
|
# Bazaar related
|
||||||
|
: ${AGNOSTER_BZR_CLEAN_FG:=${CURRENT_FG}}
|
||||||
|
: ${AGNOSTER_BZR_CLEAN_BG:=green}
|
||||||
|
: ${AGNOSTER_BZR_DIRTY_FG:=black}
|
||||||
|
: ${AGNOSTER_BZR_DIRTY_BG:=yellow}
|
||||||
|
|
||||||
|
# Mercurial related
|
||||||
|
: ${AGNOSTER_HG_NEWFILE_FG:=white}
|
||||||
|
: ${AGNOSTER_HG_NEWFILE_BG:=red}
|
||||||
|
: ${AGNOSTER_HG_CHANGED_FG:=black}
|
||||||
|
: ${AGNOSTER_HG_CHANGED_BG:=yellow}
|
||||||
|
: ${AGNOSTER_HG_CLEAN_FG:=${CURRENT_FG}}
|
||||||
|
: ${AGNOSTER_HG_CLEAN_BG:=green}
|
||||||
|
|
||||||
|
# VirtualEnv colors
|
||||||
|
: ${AGNOSTER_VENV_FG:=black}
|
||||||
|
: ${AGNOSTER_VENV_BG:=blue}
|
||||||
|
|
||||||
|
# AWS Profile colors
|
||||||
|
: ${AGNOSTER_AWS_PROD_FG:=yellow}
|
||||||
|
: ${AGNOSTER_AWS_PROD_BG:=red}
|
||||||
|
: ${AGNOSTER_AWS_FG:=black}
|
||||||
|
: ${AGNOSTER_AWS_BG:=green}
|
||||||
|
|
||||||
|
# Status symbols
|
||||||
|
: ${AGNOSTER_STATUS_RETVAL_FG:=red}
|
||||||
|
: ${AGNOSTER_STATUS_ROOT_FG:=yellow}
|
||||||
|
: ${AGNOSTER_STATUS_JOB_FG:=cyan}
|
||||||
|
: ${AGNOSTER_STATUS_BG:=black}
|
||||||
|
|
||||||
|
## Non-Color settings - set to 'true' to enable
|
||||||
|
# Show the actual numeric return value rather than a cross symbol.
|
||||||
|
: ${AGNOSTER_STATUS_RETVAL_NUMERIC:=false}
|
||||||
|
# Show git working dir in the style "/git/root master relative/dir" instead of "/git/root/relative/dir master"
|
||||||
|
: ${AGNOSTER_GIT_INLINE:=false}
|
||||||
|
# Show the git branch status in the prompt rather than the generic branch symbol
|
||||||
|
: ${AGNOSTER_GIT_BRANCH_STATUS:=true}
|
||||||
|
|
||||||
|
|
||||||
# Special Powerline characters
|
# Special Powerline characters
|
||||||
|
|
||||||
() {
|
() {
|
||||||
|
@ -83,16 +140,36 @@ prompt_end() {
|
||||||
CURRENT_BG=''
|
CURRENT_BG=''
|
||||||
}
|
}
|
||||||
|
|
||||||
|
git_toplevel() {
|
||||||
|
local repo_root=$(git rev-parse --show-toplevel)
|
||||||
|
if [[ $repo_root = '' ]]; then
|
||||||
|
# We are in a bare repo. Use git dir as root
|
||||||
|
repo_root=$(git rev-parse --git-dir)
|
||||||
|
if [[ $repo_root = '.' ]]; then
|
||||||
|
repo_root=$(pwd)
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
echo -n $repo_root
|
||||||
|
}
|
||||||
|
|
||||||
### Prompt components
|
### Prompt components
|
||||||
# Each component will draw itself, and hide itself if no information needs to be shown
|
# Each component will draw itself, and hide itself if no information needs to be shown
|
||||||
|
|
||||||
# Context: user@hostname (who am I and where am I)
|
# Context: user@hostname (who am I and where am I)
|
||||||
prompt_context() {
|
prompt_context() {
|
||||||
if [[ "$USERNAME" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
|
if [[ "$USERNAME" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
|
||||||
prompt_segment black default "%(!.%{%F{yellow}%}.)%n@%m"
|
prompt_segment "$AGNOSTER_CONTEXT_BG" "$AGNOSTER_CONTEXT_FG" "%(!.%{%F{$AGNOSTER_STATUS_ROOT_FG}%}.)%n@%m"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
prompt_git_relative() {
|
||||||
|
local repo_root=$(git_toplevel)
|
||||||
|
local path_in_repo=$(pwd | sed "s/^$(echo "$repo_root" | sed 's:/:\\/:g;s/\$/\\$/g')//;s:^/::;s:/$::;")
|
||||||
|
if [[ $path_in_repo != '' ]]; then
|
||||||
|
prompt_segment "$AGNOSTER_DIR_BG" "$AGNOSTER_DIR_FG" "$path_in_repo"
|
||||||
|
fi;
|
||||||
|
}
|
||||||
|
|
||||||
# Git: branch/detached head, dirty status
|
# Git: branch/detached head, dirty status
|
||||||
prompt_git() {
|
prompt_git() {
|
||||||
(( $+commands[git] )) || return
|
(( $+commands[git] )) || return
|
||||||
|
@ -113,11 +190,12 @@ prompt_git() {
|
||||||
ref="◈ $(command git describe --exact-match --tags HEAD 2> /dev/null)" || \
|
ref="◈ $(command git describe --exact-match --tags HEAD 2> /dev/null)" || \
|
||||||
ref="➦ $(command git rev-parse --short HEAD 2> /dev/null)"
|
ref="➦ $(command git rev-parse --short HEAD 2> /dev/null)"
|
||||||
if [[ -n $dirty ]]; then
|
if [[ -n $dirty ]]; then
|
||||||
prompt_segment yellow black
|
prompt_segment "$AGNOSTER_GIT_DIRTY_BG" "$AGNOSTER_GIT_DIRTY_FG"
|
||||||
else
|
else
|
||||||
prompt_segment green $CURRENT_FG
|
prompt_segment "$AGNOSTER_GIT_CLEAN_BG" "$AGNOSTER_GIT_CLEAN_FG"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ $AGNOSTER_GIT_BRANCH_STATUS == 'true' ]]; then
|
||||||
local ahead behind
|
local ahead behind
|
||||||
ahead=$(command git log --oneline @{upstream}.. 2>/dev/null)
|
ahead=$(command git log --oneline @{upstream}.. 2>/dev/null)
|
||||||
behind=$(command git log --oneline ..@{upstream} 2>/dev/null)
|
behind=$(command git log --oneline ..@{upstream} 2>/dev/null)
|
||||||
|
@ -128,6 +206,7 @@ prompt_git() {
|
||||||
elif [[ -n "$behind" ]]; then
|
elif [[ -n "$behind" ]]; then
|
||||||
PL_BRANCH_CHAR=$'\u21b0'
|
PL_BRANCH_CHAR=$'\u21b0'
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -e "${repo_path}/BISECT_LOG" ]]; then
|
if [[ -e "${repo_path}/BISECT_LOG" ]]; then
|
||||||
mode=" <B>"
|
mode=" <B>"
|
||||||
|
@ -149,6 +228,7 @@ prompt_git() {
|
||||||
zstyle ':vcs_info:*' actionformats ' %u%c'
|
zstyle ':vcs_info:*' actionformats ' %u%c'
|
||||||
vcs_info
|
vcs_info
|
||||||
echo -n "${${ref:gs/%/%%}/refs\/heads\//$PL_BRANCH_CHAR }${vcs_info_msg_0_%% }${mode}"
|
echo -n "${${ref:gs/%/%%}/refs\/heads\//$PL_BRANCH_CHAR }${vcs_info_msg_0_%% }${mode}"
|
||||||
|
[[ $AGNOSTER_GIT_INLINE == 'true' ]] && prompt_git_relative
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -168,12 +248,12 @@ prompt_bzr() {
|
||||||
status_all=$(echo -n "$bzr_status" | head -n1 | wc -m)
|
status_all=$(echo -n "$bzr_status" | head -n1 | wc -m)
|
||||||
revision=${$(command bzr log -r-1 --log-format line | cut -d: -f1):gs/%/%%}
|
revision=${$(command bzr log -r-1 --log-format line | cut -d: -f1):gs/%/%%}
|
||||||
if [[ $status_mod -gt 0 ]] ; then
|
if [[ $status_mod -gt 0 ]] ; then
|
||||||
prompt_segment yellow black "bzr@$revision ✚"
|
prompt_segment "$AGNOSTER_BZR_DIRTY_BG" "$AGNOSTER_BZR_DIRTY_FG" "bzr@$revision ✚"
|
||||||
else
|
else
|
||||||
if [[ $status_all -gt 0 ]] ; then
|
if [[ $status_all -gt 0 ]] ; then
|
||||||
prompt_segment yellow black "bzr@$revision"
|
prompt_segment "$AGNOSTER_BZR_DIRTY_BG" "$AGNOSTER_BZR_DIRTY_FG" "bzr@$revision"
|
||||||
else
|
else
|
||||||
prompt_segment green black "bzr@$revision"
|
prompt_segment "$AGNOSTER_BZR_CLEAN_BG" "$AGNOSTER_BZR_CLEAN_FG" "bzr@$revision"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -186,15 +266,15 @@ prompt_hg() {
|
||||||
if $(command hg prompt >/dev/null 2>&1); then
|
if $(command hg prompt >/dev/null 2>&1); then
|
||||||
if [[ $(command hg prompt "{status|unknown}") = "?" ]]; then
|
if [[ $(command hg prompt "{status|unknown}") = "?" ]]; then
|
||||||
# if files are not added
|
# if files are not added
|
||||||
prompt_segment red white
|
prompt_segment "$AGNOSTER_HG_NEWFILE_BG" "$AGNOSTER_HG_NEWFILE_FG"
|
||||||
st='±'
|
st='±'
|
||||||
elif [[ -n $(command hg prompt "{status|modified}") ]]; then
|
elif [[ -n $(command hg prompt "{status|modified}") ]]; then
|
||||||
# if any modification
|
# if any modification
|
||||||
prompt_segment yellow black
|
prompt_segment "$AGNOSTER_HG_CHANGED_BG" "$AGNOSTER_HG_CHANGED_FG"
|
||||||
st='±'
|
st='±'
|
||||||
else
|
else
|
||||||
# if working copy is clean
|
# if working copy is clean
|
||||||
prompt_segment green $CURRENT_FG
|
prompt_segment "$AGNOSTER_HG_CLEAN_BG" "$AGNOSTER_HG_CLEAN_FG"
|
||||||
fi
|
fi
|
||||||
echo -n ${$(command hg prompt "☿ {rev}@{branch}"):gs/%/%%} $st
|
echo -n ${$(command hg prompt "☿ {rev}@{branch}"):gs/%/%%} $st
|
||||||
else
|
else
|
||||||
|
@ -202,13 +282,13 @@ prompt_hg() {
|
||||||
rev=$(command hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
|
rev=$(command hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
|
||||||
branch=$(command hg id -b 2>/dev/null)
|
branch=$(command hg id -b 2>/dev/null)
|
||||||
if command hg st | command grep -q "^\?"; then
|
if command hg st | command grep -q "^\?"; then
|
||||||
prompt_segment red black
|
prompt_segment "$AGNOSTER_HG_NEWFILE_BG" "$AGNOSTER_HG_NEWFILE_FG"
|
||||||
st='±'
|
st='±'
|
||||||
elif command hg st | command grep -q "^[MA]"; then
|
elif command hg st | command grep -q "^[MA]"; then
|
||||||
prompt_segment yellow black
|
prompt_segment "$AGNOSTER_HG_CHANGED_BG" "$AGNOSTER_HG_CHANGED_FG"
|
||||||
st='±'
|
st='±'
|
||||||
else
|
else
|
||||||
prompt_segment green $CURRENT_FG
|
prompt_segment "$AGNOSTER_HG_CLEAN_BG" "$AGNOSTER_HG_CLEAN_FG"
|
||||||
fi
|
fi
|
||||||
echo -n "☿ ${rev:gs/%/%%}@${branch:gs/%/%%}" $st
|
echo -n "☿ ${rev:gs/%/%%}@${branch:gs/%/%%}" $st
|
||||||
fi
|
fi
|
||||||
|
@ -217,13 +297,18 @@ prompt_hg() {
|
||||||
|
|
||||||
# Dir: current working directory
|
# Dir: current working directory
|
||||||
prompt_dir() {
|
prompt_dir() {
|
||||||
prompt_segment blue $CURRENT_FG '%~'
|
if [[ $AGNOSTER_GIT_INLINE == 'true' ]] && $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
|
||||||
|
# Git repo and inline path enabled, hence only show the git root
|
||||||
|
prompt_segment "$AGNOSTER_DIR_BG" "$AGNOSTER_DIR_FG" "$(git_toplevel | sed "s:^$HOME:~:")"
|
||||||
|
else
|
||||||
|
prompt_segment "$AGNOSTER_DIR_BG" "$AGNOSTER_DIR_FG" '%~'
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Virtualenv: current working virtualenv
|
# Virtualenv: current working virtualenv
|
||||||
prompt_virtualenv() {
|
prompt_virtualenv() {
|
||||||
if [[ -n "$VIRTUAL_ENV" && -n "$VIRTUAL_ENV_DISABLE_PROMPT" ]]; then
|
if [[ -n "$VIRTUAL_ENV" && -n "$VIRTUAL_ENV_DISABLE_PROMPT" ]]; then
|
||||||
prompt_segment blue black "(${VIRTUAL_ENV:t:gs/%/%%})"
|
prompt_segment "$AGNOSTER_VENV_BG" "$AGNOSTER_VENV_FG" "(${VIRTUAL_ENV:t:gs/%/%%})"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -234,11 +319,15 @@ prompt_virtualenv() {
|
||||||
prompt_status() {
|
prompt_status() {
|
||||||
local -a symbols
|
local -a symbols
|
||||||
|
|
||||||
[[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}✘"
|
if [[ $AGNOSTER_STATUS_RETVAL_NUMERIC == 'true' ]]; then
|
||||||
[[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡"
|
[[ $RETVAL -ne 0 ]] && symbols+="%{%F{$AGNOSTER_STATUS_RETVAL_FG}%}$RETVAL"
|
||||||
[[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙"
|
else
|
||||||
|
[[ $RETVAL -ne 0 ]] && symbols+="%{%F{$AGNOSTER_STATUS_RETVAL_FG}%}✘"
|
||||||
|
fi
|
||||||
|
[[ $UID -eq 0 ]] && symbols+="%{%F{$AGNOSTER_STATUS_ROOT_FG}%}⚡"
|
||||||
|
[[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{$AGNOSTER_STATUS_JOB_FG}%}⚙"
|
||||||
|
|
||||||
[[ -n "$symbols" ]] && prompt_segment black default "$symbols"
|
[[ -n "$symbols" ]] && prompt_segment "$AGNOSTER_STATUS_BG" default "$symbols"
|
||||||
}
|
}
|
||||||
|
|
||||||
#AWS Profile:
|
#AWS Profile:
|
||||||
|
@ -249,8 +338,8 @@ prompt_status() {
|
||||||
prompt_aws() {
|
prompt_aws() {
|
||||||
[[ -z "$AWS_PROFILE" || "$SHOW_AWS_PROMPT" = false ]] && return
|
[[ -z "$AWS_PROFILE" || "$SHOW_AWS_PROMPT" = false ]] && return
|
||||||
case "$AWS_PROFILE" in
|
case "$AWS_PROFILE" in
|
||||||
*-prod|*production*) prompt_segment red yellow "AWS: ${AWS_PROFILE:gs/%/%%}" ;;
|
*-prod|*production*) prompt_segment "$AGNOSTER_AWS_PROD_BG" "$AGNOSTER_AWS_PROD_FG" "AWS: ${AWS_PROFILE:gs/%/%%}" ;;
|
||||||
*) prompt_segment green black "AWS: ${AWS_PROFILE:gs/%/%%}" ;;
|
*) prompt_segment "$AGNOSTER_AWS_BG" "$AGNOSTER_AWS_FG" "AWS: ${AWS_PROFILE:gs/%/%%}" ;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -30,8 +30,9 @@ local return_code="%(?..%F{red}%? ↵%f)"
|
||||||
local user_host="${PR_USER}%F{cyan}@${PR_HOST}"
|
local user_host="${PR_USER}%F{cyan}@${PR_HOST}"
|
||||||
local current_dir="%B%F{blue}%~%f%b"
|
local current_dir="%B%F{blue}%~%f%b"
|
||||||
local git_branch='$(git_prompt_info)'
|
local git_branch='$(git_prompt_info)'
|
||||||
|
local venv_prompt='$(virtualenv_prompt_info)'
|
||||||
|
|
||||||
PROMPT="╭─${user_host} ${current_dir} \$(ruby_prompt_info) ${git_branch}
|
PROMPT="╭─${venv_prompt}${user_host} ${current_dir} \$(ruby_prompt_info) ${git_branch}
|
||||||
╰─$PR_PROMPT "
|
╰─$PR_PROMPT "
|
||||||
RPROMPT="${return_code}"
|
RPROMPT="${return_code}"
|
||||||
|
|
||||||
|
@ -39,5 +40,7 @@ ZSH_THEME_GIT_PROMPT_PREFIX="%F{yellow}‹"
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="› %f"
|
ZSH_THEME_GIT_PROMPT_SUFFIX="› %f"
|
||||||
ZSH_THEME_RUBY_PROMPT_PREFIX="%F{red}‹"
|
ZSH_THEME_RUBY_PROMPT_PREFIX="%F{red}‹"
|
||||||
ZSH_THEME_RUBY_PROMPT_SUFFIX="›%f"
|
ZSH_THEME_RUBY_PROMPT_SUFFIX="›%f"
|
||||||
|
ZSH_THEME_VIRTUALENV_PREFIX="%F{red}("
|
||||||
|
ZSH_THEME_VIRTUALENV_SUFFIX=")%f "
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue