From 100fb29e0e055a5de8ab6cc0a13e28b15fdd63ee Mon Sep 17 00:00:00 2001 From: Emerson Veenstra Date: Sun, 16 Jul 2017 17:51:11 -0400 Subject: [PATCH] zsh changes --- .zshrc | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.zshrc b/.zshrc index c5500f0..7fb780a 100644 --- a/.zshrc +++ b/.zshrc @@ -1,14 +1,24 @@ -export PATH=$HOME/Documents/bin:/usr/local/bin:$PATH -export ZSH=/home/emerson/.oh-my-zsh +export PATH=$HOME/Documents/bin:/usr/local/bin:/usr/bin:/bin +export ZSH=$HOME/.oh-my-zsh +export TEXMFHOME=$HOME/.texmf +ZSH_THEME="" -ZSH_THEME="agnoster" +function prompt_char { + if [ $UID -eq 0 ]; then echo "#"; else echo $; fi +} DISABLE_UNTRACKED_FILES_DIRTY="true" plugins=(git) source $ZSH/oh-my-zsh.sh +export LANG=en_US.UTF-8 + export EDITOR='vim' -export DEFAULT_USER=`whoami` + +PROMPT='%(!.%{$fg_bold[red]%}.%{$fg_bold[green]%}) %{%F{24}%}%(!.%1~.%~) $(git_prompt_info)%_$(prompt_char)%{$reset_color%} ' + +ZSH_THEME_GIT_PROMPT_PREFIX="(" +ZSH_THEME_GIT_PROMPT_SUFFIX=") " parent() { [[ ${1[1,$#2]} == $2 ]] } sibling() { [[ ${1:a:h} == ${2:a:h} ]] } @@ -56,4 +66,3 @@ alias gstage='git diff-index --cached --name-only HEAD' alias gtheirs='git ls-files --unmerged | cut -f2 | uniq | xargs git checkout --theirs' alias gtree='git log --graph --all --pretty=format:"%Cred%h%Creset - %Cgreen(%cr)%Creset %s%C(yellow)%d%Creset" --abbrev-commit --date=relative' alias gauthors="git log --format='%aN <%aE>' | sort -u | egrep -v '\+ed'" -