Remove some cruft from zshrc

This commit is contained in:
Sami Samhuri 2024-09-03 15:15:25 -07:00
parent 36582ea6e6
commit 51be718809
No known key found for this signature in database

57
zshrc
View file

@ -209,7 +209,6 @@ prompt sjs
# -------------------------------- # --------------------------------
alias bgd='bg; disown %1' alias bgd='bg; disown %1'
alias cp='nocorrect cp' # don't correct spelling for 'cp' alias cp='nocorrect cp' # don't correct spelling for 'cp'
alias e='mate'
alias ez="$EDITOR ~/.zshrc && source ~/.zshrc" alias ez="$EDITOR ~/.zshrc && source ~/.zshrc"
alias mkdir='nocorrect mkdir' # don't correct spelling for 'mkdir' alias mkdir='nocorrect mkdir' # don't correct spelling for 'mkdir'
@ -228,53 +227,41 @@ alias doc='docker-compose'
if mac; then if mac; then
gls_path=`which gls` gls_path=`which gls`
if [[ -x "$gls_path" ]]; then if [[ -x "$gls_path" ]]; then
alias ls='$gls_path -BF --color=auto' alias ls="$gls_path -BF --color=auto"
alias la='$gls_path -AF --color=auto'
else else
alias ls='ls -BF' alias ls='ls -BF'
alias la='ls -AF'
fi fi
else else
alias ls='ls -BF --color=auto' alias ls='ls -BF --color=auto'
alias la='ls -AF --color=auto'
fi fi
alias ll='ls -l'
alias lsd='ls -d'
alias lld='ls -dl'
### ruby ### ruby
alias irb='irb --readline -r irb/completion' alias irb='irb --readline -r irb/completion'
### git ### git
if command_exists git; then alias a='git add'
alias a='git add' alias b='git branch'
alias b='git branch' alias c='git commit'
alias c='git commit' alias co='git checkout'
alias cam='git commit -a -m' alias chp='git cherry-pick'
alias co='git checkout' alias d='git diff'
alias chp='git cherry-pick' alias dc='git diff --cached'
alias d='git diff' alias ds='git diff --stat'
alias dc='git diff --cached' alias f='git fetch'
alias dmcr='git diff-merge-conflict-resolution' alias glo='git log --oneline --decorate'
alias ds='git diff --stat' alias gls='git log --stat'
alias ecf='git edit-conflicted-files' alias gup='git update'
alias f='git fetch' alias m='git merge'
alias glo='git log --oneline --decorate' alias rmb='git remove-merged-branches'
alias gls='git log --stat' alias s='git status -sb'
alias gup='git update' alias st='git stash'
alias m='git merge' alias stl='git stash list'
alias pfb='git push-feature-branch' alias stp='git stash pop'
alias rmb='git remove-merged-branches' alias t='git tag'
alias s='git status -sb'
alias st='git stash'
alias stl='git stash list'
alias stp='git stash pop'
alias t='git tag'
function gl() { function gl() {
git log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' "$@" git log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' "$@"
} }
fi
# `cd /path/to/a/file` does `cd /path/to/a` # `cd /path/to/a/file` does `cd /path/to/a`
function cd () { function cd () {