Resolved alias conflict

This commit is contained in:
Aaron Biggs 2016-04-14 08:46:11 -05:00
commit bfa98b1be8
2 changed files with 19 additions and 1 deletions

View file

@ -43,3 +43,21 @@ alias code='~/Dropbox/Code'
# SSHuttle # SSHuttle
alias tunnel='sshuttle -D --pidfile=/tmp/sshuttle.pid -r abiggs@10.26.0.80 10.26.196.0/24' alias tunnel='sshuttle -D --pidfile=/tmp/sshuttle.pid -r abiggs@10.26.0.80 10.26.196.0/24'
alias stoptunnel='[[ -f /tmp/sshuttle.pid ]] && kill `cat /tmp/sshuttle.pid`' alias stoptunnel='[[ -f /tmp/sshuttle.pid ]] && kill `cat /tmp/sshuttle.pid`'
alias dw='~/Dropbox'
alias dp='~/Dropbox\ \(Personal\)'
# Docker Machine
alias dminit="docker-machine create --driver virtualbox dev"
alias dmup="docker-machine start dev && eval \"\$(docker-machine env dev)\""
alias dm="docker-machine"
# Docker Compose
alias dc="docker-compose"
alias dcup="docker-compose up -d"
alias dcdown="docker-compose stop"
alias dcrm="docker-compose stop && docker-compose rm -f"
# SSH
alias casapps="ssh 10.26.0.80"
alias casdb="ssh 10.26.192.133"

View file

@ -49,7 +49,7 @@ ZSH_THEME="agnoster"
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse) # Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup. # Add wisely, as too many plugins slow down shell startup.
plugins=(capistrano common-aliases git laravel4 rbenv systemadmin) plugins=(common-aliases git rbenv systemadmin)
source $ZSH/oh-my-zsh.sh source $ZSH/oh-my-zsh.sh