diff --git a/.zshrc b/.zshrc index b969776..ce78d75 100644 --- a/.zshrc +++ b/.zshrc @@ -1,4 +1,5 @@ -export PATH=/home/emerson/.local/bin:/usr/local/sbin:/usr/local/opt/ruby/bin:/usr/local/lib/ruby/gems/3.0.0/bin:$PATH +export GEM_HOME="$HOME/.local/gems" +export PATH="$HOME/.local/bin:$HOME/.local/gems/bin:$PATH" export ZSH=$HOME/.oh-my-zsh ZSH_THEME="" @@ -32,38 +33,15 @@ function chpwd() { alias git='noglob git' alias ga='git add' -alias gaa='git add .' -alias gb='git branch' alias gc='git commit' -alias gch='git checkout' -alias gcl='git clone' alias gd='git diff' -alias gdc='git diff HEAD~1' alias gds='git diff --staged' -alias gf='git fetch' alias gp='git push' -alias gpu='git pull' -alias grb='git rebase' -alias grbc='git rebase --continue' -alias grh='git reset --hard' alias gs='git status' -alias wtf='git wtf' - - -alias gbranch='git name-rev --name-only HEAD' -alias gcurrent='git log -1 --oneline' -alias gfiles='git ls-tree --name-only -r $(git name-rev --name-only HEAD)' -alias gours='git ls-files --unmerged | cut -f2 | uniq | xargs git checkout --ours' -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(%cd - %cr)%Creset %s%C(yellow)%d %an%Creset" --abbrev-commit --date=iso' -alias gauthors="git log --format='%aN <%aE>' | sort -u | egrep -v '\+ed'" alias getunicode="perl -C7 -ne 'for(split(//)){print sprintf(\"U\+\%04X\", ord).\" \".\$_.\"\n\"}'" -alias mkenv="python3.7 -m venv .env && source .env/bin/activate" -alias senv="source .env/bin/activate" - if [ -z "$SSH_AUTH_SOCK" ] then # Check for a currently running instance of the agent