Merge remote-tracking branch 'robbyrussell/master' into develop

Conflicts:
	.gitignore
	README.textile
	lib/aliases.zsh
	lib/functions.zsh
	lib/git.zsh
	lib/misc.zsh
	templates/zshrc.zsh-template
	tools/install.sh
This commit is contained in:
Shawn Sorichetti 2012-01-26 09:04:31 -05:00
commit ced4f4decc
111 changed files with 4273 additions and 378 deletions

View file

@ -10,49 +10,5 @@ bindkey "^[m" copy-prev-shell-word
setopt long_list_jobs
## pager
export PAGER='less -R'
export LC_CTYPE=en_US.UTF-8
## pretty man pages
function pman() {
man $1 -t | open -f -a Preview
}
#
## pretty JSON
function pj() {
python -mjson.tool
}
## Open current directory
alias oo='open .'
## Quick-look a file (^C to close)
alias ql='qlmanage -p 2>/dev/null'
## Start a local SMTP server and dump emails sent to it to the console
alias smtpconsole='python -m smtpd -n -c DebuggingServer localhost:1025'
## Serve the current folder on port 80
alias serve_this='python -m SimpleHTTPServer'
## Highlight-aware less command
alias hl='less -R'
## Show history
alias history='fc -l 1'
## Color grep results
## Examples: http://rubyurl.com/ZXv
export GREP_OPTIONS='--color=auto'
export GREP_COLOR='1;32'
# Quick and dirty encryption
function encrypt() {
openssl des3 -a -in $1 -out $1.des3
}
function decrypt() {
openssl des3 -d -a -in $1 -out ${1%.des3}
}
export PAGER=less
export LC_CTYPE=$LANG