Still tidying up
This commit is contained in:
Josh Sherman
parent
bf7a44c842
commit
db3ef7f7a6
2 changed files with 42 additions and 151 deletions
|
|
@ -6,6 +6,7 @@ packages:
|
|||
- bash
|
||||
- ghi
|
||||
- git
|
||||
- git-extras
|
||||
- imagemagick
|
||||
- likes
|
||||
- memcached
|
||||
|
|
|
|||
192
zsh/zshrc
192
zsh/zshrc
|
|
@ -6,127 +6,60 @@ ZSH_THEME="joshtronic"
|
|||
|
||||
COMPLETION_WAITING_DOTS="true"
|
||||
|
||||
plugins=(brew git git-extras mercurial osx redis-cli)
|
||||
plugins=(brew common-aliases composer git-extras git gitfast github gitignore jsontools meteor node npm nvm osx redis-cli rsync systemadmin vundle web-search xcode z zsh_reload)
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
||||
PHP_FULL_VERSION=`php --version | head -n 1 | awk '{print $2}'`
|
||||
PHP_MAJOR_MINOR=`echo $PHP_FULL_VERSION | awk -F '.' '{print $1$2}'`
|
||||
PHP_BASE_PATH=/usr/local/Cellar/php$PHP_MAJOR_MINOR/$PHP_FULL_VERSION
|
||||
|
||||
export PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:$PHP_BASE_PATH/lib/php:~/Source/dotfiles/scripts:~/Source/dotfiles/git/scripts:$PHP_BASE_PATH/bin:/opt/X11/bin:$PHP_BASE_PATH/lib/php/File
|
||||
|
||||
# apt-*
|
||||
alias ac="sudo apt-cache"
|
||||
alias acs="sudo apt-cache search"
|
||||
alias ag="sudo apt-get"
|
||||
alias agar="sudo apt-get autoremove"
|
||||
alias agi="sudo apt-get install"
|
||||
alias agp="sudo apt-get purge"
|
||||
alias agr="sudo apt-get remove"
|
||||
alias agud="sudo apt-get update"
|
||||
alias agug="sudo apt-get upgrade"
|
||||
alias aguu="sudo apt-get update && sudo apt-get upgrade"
|
||||
|
||||
# cd *
|
||||
alias desktop="cd ~/Desktop"
|
||||
|
||||
# free
|
||||
alias fm="free -m"
|
||||
|
||||
# dns
|
||||
alias fldns="sudo killall -HUP mDNSResponder"
|
||||
|
||||
# ghi
|
||||
alias issues="ghi"
|
||||
alias oi="issues"
|
||||
alias ob="ghi list -LBug"
|
||||
alias od="ghi list -LDevelopment"
|
||||
alias oe="ghi list -LEnhancement"
|
||||
alias nb="ghi open -LBug"
|
||||
alias nd="ghi open -LDevelopment"
|
||||
alias ne="ghi open -LEnhancement"
|
||||
alias si="ghi show"
|
||||
alias ei="ghi edit"
|
||||
alias ci="ghi comment"
|
||||
alias xi="ghi close"
|
||||
# PHP_FULL_VERSION=`php --version | head -n 1 | awk '{print $2}'`
|
||||
# PHP_MAJOR_MINOR=`echo $PHP_FULL_VERSION | awk -F '.' '{print $1$2}'`
|
||||
# PHP_BASE_PATH=/usr/local/Cellar/php$PHP_MAJOR_MINOR/$PHP_FULL_VERSION
|
||||
#
|
||||
# export PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:$PHP_BASE_PATH/lib/php:~/Source/dotfiles/scripts:~/Source/dotfiles/git/scripts:$PHP_BASE_PATH/bin:/opt/X11/bin:$PHP_BASE_PATH/lib/php/File
|
||||
|
||||
# git
|
||||
alias g="git"
|
||||
alias ga="git add"
|
||||
alias gaa="git add --all"
|
||||
alias gb="git branch"
|
||||
alias gba="git branch -a"
|
||||
alias gc="git commit"
|
||||
alias gca="git commit -a"
|
||||
alias gcl="git clone"
|
||||
alias gco="git checkout"
|
||||
alias gcob="git checkout -B"
|
||||
alias gcom="git checkout master"
|
||||
alias gd="git diff"
|
||||
alias gdb="git delete-branch"
|
||||
alias gf="git fetch"
|
||||
alias gl="git log"
|
||||
alias gm="git merge"
|
||||
alias gmm="git merge master"
|
||||
alias gmup="git fetch upstream; git merge origin/upstream"
|
||||
alias gmv="git mv"
|
||||
alias gp="git rev-parse --abbrev-ref HEAD | xargs git push origin"
|
||||
alias gpu="git rev-parse --abbrev-ref HEAD | xargs git pull origin"
|
||||
alias gr="git remote"
|
||||
alias gra="git remote add"
|
||||
alias grao="git remote add origin"
|
||||
alias grr="git remote rm"
|
||||
alias grro="git remote rm origin"
|
||||
alias grm="git rm"
|
||||
alias gs="git status"
|
||||
|
||||
# grep
|
||||
alias grep="grep --exclude-dir=.git"
|
||||
|
||||
# iPhone Simulator
|
||||
alias ios="open /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone\ Simulator.app"
|
||||
#alias ga="git add"
|
||||
#alias gaa="git add --all"
|
||||
#alias gb="git branch"
|
||||
#alias gba="git branch -a"
|
||||
#alias gc="git commit"
|
||||
#alias gca="git commit -a"
|
||||
#alias gcl="git clone"
|
||||
#alias gco="git checkout"
|
||||
#alias gcob="git checkout -B"
|
||||
#alias gcom="git checkout master"
|
||||
#alias gd="git diff"
|
||||
#alias gdb="git delete-branch"
|
||||
#alias gf="git fetch"
|
||||
#alias gl="git log"
|
||||
#alias gm="git merge"
|
||||
#alias gmm="git merge master"
|
||||
#alias gmup="git fetch upstream; git merge origin/upstream"
|
||||
#alias gmv="git mv"
|
||||
#alias gp="git rev-parse --abbrev-ref HEAD | xargs git push origin"
|
||||
#alias gpu="git rev-parse --abbrev-ref HEAD | xargs git pull origin"
|
||||
#alias gr="git remote"
|
||||
#alias gra="git remote add"
|
||||
#alias grao="git remote add origin"
|
||||
#alias grr="git remote rm"
|
||||
#alias grro="git remote rm origin"
|
||||
#alias grm="git rm"
|
||||
#alias gs="git status"
|
||||
|
||||
# jekyll
|
||||
alias jekyll="(sleep 5 && open http://localhost:4000) & jekyll serve --watch"
|
||||
|
||||
# memcached
|
||||
alias flmc="echo 'flush_all' | nc localhost 11211"
|
||||
alias mc="telnet localhost 11211"
|
||||
alias jekyll="jekyll serve --watch"
|
||||
|
||||
# mtr
|
||||
alias mtr="sudo mtr"
|
||||
|
||||
# mysql
|
||||
alias mysql="mysql -uroot"
|
||||
alias myst="mysql street"
|
||||
|
||||
# python
|
||||
alias py="python"
|
||||
|
||||
# quit
|
||||
alias quit="exit"
|
||||
|
||||
# rsync
|
||||
alias rsync="rsync --compress --progress"
|
||||
|
||||
# servers
|
||||
alias aurora="ssh aurora"
|
||||
alias apps1="ssh availability@apps1"
|
||||
alias apps1root="ssh root@apps1"
|
||||
|
||||
# wc
|
||||
alias lc="wc -l"
|
||||
|
||||
# zsh
|
||||
alias zshrc="source ~/.zshrc"
|
||||
#alias zshrc="source ~/.zshrc"
|
||||
|
||||
# vim
|
||||
alias v="vim -p"
|
||||
alias vi="vim -p"
|
||||
alias vim="vim -p"
|
||||
alias vd="vimdiff"
|
||||
alias vo="vim -O"
|
||||
#alias v="vim -p"
|
||||
#alias vi="vim -p"
|
||||
#alias vim="vim -p"
|
||||
#alias vd="vimdiff"
|
||||
#alias vo="vim -O"
|
||||
|
||||
|
||||
# Platform-specific
|
||||
|
|
@ -152,48 +85,5 @@ for method in GET HEAD POST PUT DELETE TRACE OPTIONS; do
|
|||
alias "$method"="lwp-request -m '$method'"
|
||||
done
|
||||
|
||||
# Private aliases
|
||||
if [ -e ~/.zshrc-private ]
|
||||
then
|
||||
source ~/.zshrc-private
|
||||
fi
|
||||
|
||||
# # Check for updates to Homebrew
|
||||
# BREW_UPDATE_FILE=~/.brew-update
|
||||
#
|
||||
# function _update_brew_update()
|
||||
# {
|
||||
# echo "BREW_UPDATE=`date +%s`" > $BREW_UPDATE_FILE
|
||||
# }
|
||||
#
|
||||
# _update_brew_update
|
||||
#
|
||||
# if [ -f $BREW_UPDATE_FILE ]
|
||||
# then
|
||||
# . ~/.brew-update
|
||||
#
|
||||
# if [[ -z "$BREW_UPDATE" ]]; then
|
||||
# _update_brew_update
|
||||
# fi
|
||||
#
|
||||
# CURRENT_TIME=`date +%s`
|
||||
# UPDATE_OFFSET=$((10 * 86400))
|
||||
# NEXT_UPDATE=$(( CURRENT_TIME + UPDATE_OFFSET ))
|
||||
#
|
||||
# if [ $BREW_UPDATE -gt $NEXT_UPDATE ]
|
||||
# then
|
||||
# echo "[Homebrew] Would you like to check for updates?"
|
||||
# echo "Type Y to update Homebrew: \c"
|
||||
# read line
|
||||
# if [ "$line" = Y ] || [ "$line" = y ]; then
|
||||
# brew update
|
||||
# brew upgrade
|
||||
# fi
|
||||
#
|
||||
# _update_brew_update
|
||||
# fi
|
||||
# else
|
||||
# _update_brew_update
|
||||
# fi
|
||||
|
||||
export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue