mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-01-24 01:37:27 +08:00
Compare commits
4 Commits
12669f29f0
...
48a3c2f32d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
48a3c2f32d | ||
|
|
1916a31153 | ||
|
|
0e5fed193e | ||
|
|
b3d1826a43 |
@ -7,6 +7,7 @@ function setup_using_base_dir() {
|
||||
fzfdirs=(
|
||||
"${HOME}/.fzf"
|
||||
"${HOME}/.nix-profile/share/fzf"
|
||||
"${XDG_DATA_HOME:-$HOME/.local/share}/fzf"
|
||||
"/usr/local/opt/fzf"
|
||||
"/usr/share/fzf"
|
||||
"/usr/local/share/examples/fzf"
|
||||
|
||||
@ -131,7 +131,8 @@ d0() {
|
||||
|
||||
# gather external ip address
|
||||
geteip() {
|
||||
curl -s -S https://icanhazip.com
|
||||
curl -s -S -4 https://icanhazip.com
|
||||
curl -s -S -6 https://icanhazip.com
|
||||
}
|
||||
|
||||
# determine local IP address(es)
|
||||
|
||||
@ -26,15 +26,26 @@ ys_hg_prompt_info() {
|
||||
if [ -d '.hg' ]; then
|
||||
echo -n "${YS_VCS_PROMPT_PREFIX1}hg${YS_VCS_PROMPT_PREFIX2}"
|
||||
echo -n $(hg branch 2>/dev/null)
|
||||
if [ -n "$(hg status 2>/dev/null)" ]; then
|
||||
echo -n "$YS_VCS_PROMPT_DIRTY"
|
||||
else
|
||||
echo -n "$YS_VCS_PROMPT_CLEAN"
|
||||
if [[ "$(hg config oh-my-zsh.hide-dirty 2>/dev/null)" != "1" ]]; then
|
||||
if [ -n "$(hg status 2>/dev/null)" ]; then
|
||||
echo -n "$YS_VCS_PROMPT_DIRTY"
|
||||
else
|
||||
echo -n "$YS_VCS_PROMPT_CLEAN"
|
||||
fi
|
||||
fi
|
||||
echo -n "$YS_VCS_PROMPT_SUFFIX"
|
||||
fi
|
||||
}
|
||||
|
||||
# Virtualenv
|
||||
local venv_info='$(virtenv_prompt)'
|
||||
YS_THEME_VIRTUALENV_PROMPT_PREFIX=" %{$fg[green]%}"
|
||||
YS_THEME_VIRTUALENV_PROMPT_SUFFIX=" %{$reset_color%}%"
|
||||
virtenv_prompt() {
|
||||
[[ -n ${VIRTUAL_ENV} ]] || return
|
||||
echo "${YS_THEME_VIRTUALENV_PROMPT_PREFIX}${VIRTUAL_ENV:t}${YS_THEME_VIRTUALENV_PROMPT_SUFFIX}"
|
||||
}
|
||||
|
||||
local exit_code="%(?,,C:%{$fg[red]%}%?%{$reset_color%})"
|
||||
|
||||
# Prompt format:
|
||||
@ -55,6 +66,7 @@ PROMPT="
|
||||
%{$terminfo[bold]$fg[yellow]%}%~%{$reset_color%}\
|
||||
${hg_info}\
|
||||
${git_info}\
|
||||
${venv_info}\
|
||||
\
|
||||
%{$fg[white]%}[%*] $exit_code
|
||||
%{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user