michael/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updates to vim themes and zsh aliases

Browse Source
This commit is contained in:
Michael Campagnaro
2014-11-30 19:18:25 -05:00
parent 0852f25760
commit fcd74e51e3
8 changed files with 263 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
zsh/aliases
View File

@@ -66,7 +66,7 @@ alias mi='mvn install'
alias mci='mvn clean install'
alias mp='mvn package'
alias mcp='mvn clean package'
alias opensource='cd ~/code/open-source'
alias opensource='cd ~/jelly/open-source'
alias patch='git format-patch HEAD^ --stdout > patch.diff'
alias reguard='killall -9 ruby ; guard'
alias r='rails'
@@ -92,11 +92,6 @@ alias vh='vagrant halt'
alias vs='vagrant ssh'
alias vu='vagrant up'
alias vimrc='vim ~/.vimrc'
alias q='quirk'
alias qe='quirk -e'
alias qc='quirk -c'
alias qm='quirk -m'
alias qq='quirk -t'
alias zsh='vim ~/.zshrc'
@@ -121,6 +116,8 @@ alias gco='git checkout'
alias gcob='git checkout -b'
alias gcon='vi .git/config'
alias gcp='git cherry-pick'
alias gcpa='git cherry-pick --abort'
alias gcpc='git cherry-pick --continue'
alias gcps='git cherry-pick -n'
alias gd='git diff'
alias gdc='git diff --cached'
@@ -128,8 +125,8 @@ alias gdm='git diff master'
alias gds='git diff --stat=160,120'
alias gdw='git diff --color-words'
alias gf='git fetch'
alias gfix="ga && git commit -a --amend -C HEAD"
alias gfixs="ga && git commit -S -a --amend -C HEAD" # signed
alias gfix="git commit --amend -C HEAD"
alias gfixs="git commit -S -a --amend -C HEAD" # signed
alias gfo='git fetch origin'
alias gfm='git fetch origin master'
alias gh="source ~/.githelpers && show_git_head"
@@ -140,6 +137,7 @@ alias gla='gll --all'
alias glog='git log'
alias glogf='git log --follow'
alias gm='git merge'
alias gmnoff='git merge --no-ff'
alias gmff='git merge --ff-only'
alias gmffs='git merge --ff-only --squash'
alias gmtheirs='git merge -Xtheirs'
@@ -189,35 +187,33 @@ alias gtd='git tag -d'
alias gtl='git tag -l'
alias gx='git reset --hard'
alias gxx='git reset --hard HEAD~1 && git pull --ff-only'
# git stats
alias gstats="echo 'Total commits: $(git rev-list HEAD --count)'; echo '\nAuthor breakdown:'; git shortlog | grep -E '^[^ ]'"
# Notes
alias art='cd ~/Dropbox/notes/art'
alias notes='cd ~/Dropbox/notes'
alias notes='cd ~/jelly/documents'
alias bucket='cd ~/Dropbox/notes/buckets'
alias pn='vim ~/Dropbox/notes/stack.txt'
alias pn='vim ~/jelly/documents/Notes/stack.txt'
alias sharp='vim ~/Dropbox/notes/sharpening-notes'
alias writing='cd ~/brain/writing'
alias what='cd ~/brain/writing/2014/what-happened'
# Projects
alias projects='cd ~/code/projects'
alias web='cd ~/code/projects/websites/michael.is'
alias weba='cd ~/code/projects/websites/michael.is/angular'
alias projects='cd ~/jelly/projects'
alias web='cd ~/jelly/projects/websites/michael.is'
alias weba='cd ~/jelly/projects/websites/michael.is/angular'
alias dot='cd ~/jelly/projects/dotfiles'
alias work='cd ~/work'
alias brain='cd ~/brain'
alias school='cd ~/brain/school'
if [[ $platform == 'Linux' ]]; then
alias pcg='cd ~/code/pcg'
alias dive='cd ~/code/pcg/dive'
elif [[ $platform == 'Darwin' ]]; then
alias pcg='cd ~/work/pcg'
alias dive='cd ~/work/pcg/dive-network/dive'
fi
alias pcg='cd ~/work/pcg'
alias dive='cd ~/work/pcg/dive-network/dive'
alias di='cd ~/work/pcg/dive-network/dive/src-cljs/dive'
# Work
alias pcgn='vim ~/work/pcg/files/notes/personal-notes.txt'
alias pcgr='vim ~/work/pcg/files/notes/refactoring-notes.txt'
alias pcgn='vim ~/work/pcg/files/notes/personal-notes.md'
alias pcgr='vim ~/work/pcg/files/notes/refactoring-notes.md'
alias pcgf='cd ~/work/pcg/files'
alias bastion='ssh 54.86.79.26 -l pcg-user -i ~/.ssh/pcg-ec2-pcg-user'
alias sigma='cd ~/pcg/pcg-ansible && ssh -vF files/ssh/config pcg-user@sigma'
@@ -225,3 +221,6 @@ alias qonos='cd ~/pcg/pcg-ansible && ssh -vF files/ssh/config pcg-user@qonos'
alias samza1='cd ~/pcg/pcg-ansible && ssh -vF files/ssh/config pcg-user@samza1'
alias samza2='cd ~/pcg/pcg-ansible && ssh -vF files/ssh/config pcg-user@samza2'
alias samza3='cd ~/pcg/pcg-ansible && ssh -vF files/ssh/config pcg-user@samza3'
alias dstaging='ssh pcg-user@192.168.2.20 -i ~/.ssh/dive_20140923_rsa'
alias dclear='ssh pcg-user@192.168.2.90 -i ~/.ssh/dive_20140923_rsa'
alias dh='git push heroku-staging master -f'