This commit is contained in:
Ghasem Shirazi 2021-04-14 11:51:32 -07:00
commit 8e6ec2f2c9
2 changed files with 30 additions and 27 deletions

View file

@ -128,6 +128,9 @@ export LESSOPEN="|/usr/local/bin/lesspipe.sh %s" LESS_ADVANCED_PREPROCESSOR=1
# ssh
export SSH_KEY_PATH="~/.ssh/id_rsa"
# github pat
export GITHUB_PAT=$(cat $HOME/.git/.pat)
# Set personal aliases, overriding those provided by oh-my-zsh libs,
# plugins, and themes. Aliases can be placed here, though oh-my-zsh
# users are encouraged to define aliases within the ZSH_CUSTOM folder.
@ -138,7 +141,7 @@ alias vb='virtualbox'
alias vm='VBoxManage'
alias vmls='VBoxManage list vms'
alias vmclo='VBoxManage clonevm' ## <UUID> --name "Ubuntu 18.04 C"
alias vmreg='VBoxManage registervm" ## ~/VirtualBox\ VMs/Ubuntu\ 18.04\ C/Ubuntu\ 18.04\ C.vbox
alias vmreg='VBoxManage registervm' ## ~/VirtualBox\ VMs/Ubuntu\ 18.04\ C/Ubuntu\ 18.04\ C.vbox
alias grep='grep --color=auto'
alias gck='git checkout'
alias sublime='/Applications/Sublime.app/Contents/MacOS/Sublime'
@ -147,8 +150,8 @@ alias eclipse='~/eclipse/cpp-2018-09/eclipse/eclipse'
alias ec='eclipse 2>/dev/null'
alias ff='firefox 2>/dev/null'
alias ge='gedit 2>/dev/null'
alias edit='atom'
# alias edit='atom'
alias ez="edit ~/.zshrc"
alias ezo="edit ~/.oh-my-zsh"
#alias ifconfig='/sbin/ifconfig'
# alias ifconfig='/sbin/ifconfig'
source $DOTFILES/k8s/kubectl_helpers.sh

View file

@ -123,30 +123,30 @@ prompt_git() {
fi
# from zsh-git-prompt/zshrc.sh
precmd_update_git_vars
if [ -n "$__CURRENT_GIT_STATUS" ]; then
if [ "$GIT_CHANGED" -ne "0" ]; then
mode+=" $ZSH_THEME_GIT_PROMPT_CHANGED$GIT_CHANGED"
fi
if [ "$GIT_STAGED" -ne "0" ]; then
mode+=" $ZSH_THEME_GIT_PROMPT_STAGED$GIT_STAGED"
fi
if [ "$GIT_BEHIND" -ne "0" ]; then
mode+=" %{%F{black}$ZSH_THEME_GIT_PROMPT_BEHIND$GIT_BEHIND%f%}"
fi
if [ "$GIT_AHEAD" -ne "0" ]; then
mode+=" %{%F{black}$ZSH_THEME_GIT_PROMPT_AHEAD$GIT_AHEAD%f%}"
fi
if [ "$GIT_CONFLICTS" -ne "0" ]; then
mode+=" $ZSH_THEME_GIT_PROMPT_CONFLICTS$GIT_CONFLICTS"
fi
if [ "$GIT_UNTRACKED" -ne "0" ]; then
mode+=" %{%F{black}$ZSH_THEME_GIT_PROMPT_UNTRACKED$GIT_UNTRACKED%f%}"
fi
if [ "$GIT_CHANGED" -eq "0" ] && [ "$GIT_CONFLICTS" -eq "0" ] && [ "$GIT_STAGED" -eq "0" ] && [ "$GIT_UNTRACKED" -eq "0" ]; then
mode+=" %{%F{blue}\u2691%f%}"
fi
fi
# precmd_update_git_vars
# if [ -n "$__CURRENT_GIT_STATUS" ]; then
# if [ "$GIT_CHANGED" -ne "0" ]; then
# mode+=" $ZSH_THEME_GIT_PROMPT_CHANGED$GIT_CHANGED"
# fi
# if [ "$GIT_STAGED" -ne "0" ]; then
# mode+=" $ZSH_THEME_GIT_PROMPT_STAGED$GIT_STAGED"
# fi
# if [ "$GIT_BEHIND" -ne "0" ]; then
# mode+=" %{%F{black}$ZSH_THEME_GIT_PROMPT_BEHIND$GIT_BEHIND%f%}"
# fi
# if [ "$GIT_AHEAD" -ne "0" ]; then
# mode+=" %{%F{black}$ZSH_THEME_GIT_PROMPT_AHEAD$GIT_AHEAD%f%}"
# fi
# if [ "$GIT_CONFLICTS" -ne "0" ]; then
# mode+=" $ZSH_THEME_GIT_PROMPT_CONFLICTS$GIT_CONFLICTS"
# fi
# if [ "$GIT_UNTRACKED" -ne "0" ]; then
# mode+=" %{%F{black}$ZSH_THEME_GIT_PROMPT_UNTRACKED$GIT_UNTRACKED%f%}"
# fi
# if [ "$GIT_CHANGED" -eq "0" ] && [ "$GIT_CONFLICTS" -eq "0" ] && [ "$GIT_STAGED" -eq "0" ] && [ "$GIT_UNTRACKED" -eq "0" ]; then
# mode+=" %{%F{blue}\u2691%f%}"
# fi
# fi
# end from zsh-git-prompt/zshrc.sh
if [[ -e "${repo_path}/BISECT_LOG" ]]; then