bc6875651950
Merge.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Sat, 01 May 2010 15:04:17 -0400 |
parents | c37b42fc8409 (current diff) 3a5a19f5dd1f (diff) |
children | 25fd2544de00 |
branches/tags | (none) |
files |
Changes
--- a/.gitconfig Sat May 01 15:04:04 2010 -0400 +++ b/.gitconfig Sat May 01 15:04:17 2010 -0400 @@ -26,3 +26,8 @@ diff = auto interactive = auto status = auto + +[codebase] +username = steve +apikey = zl2b3od1ln9g23438nhvug0yoppe5lkia9ro3pun +domain = dwaiter.codebasehq.com
--- a/.zshrc Sat May 01 15:04:04 2010 -0400 +++ b/.zshrc Sat May 01 15:04:17 2010 -0400 @@ -7,24 +7,10 @@ unsetopt promptcr # Useful aliases ------------------------------------------------------------- -alias ls='ls -Goh' -alias less='less -R' -alias hl='less -R' -alias pm='python manage.py' -alias oo='open .' alias j='z' alias fab='fab -i ~/.ssh/stevelosh' alias tweets-stevelosh='~/src/grabtweets/grabtweets.py -p ~/Documents/tweets/stevelosh' -alias meme="curl -q --silent meme.boxofjunk.ws/moar.txt?lines=1" -alias deact='deactivate' -alias serve_this='python -m SimpleHTTPServer' alias oldgcc='export CC=/usr/bin/gcc-4.0' -alias smtpconsole='python -m smtpd -n -c DebuggingServer localhost:1025' -alias fic='~/src/fictiongen/generate.py -c 5 | pbcopy' -alias ficp='~/src/fictiongen/generate.py -p -c 5 | pbcopy' -alias fict='~/src/fictiongen/generate.py -t | pbcopy' -alias gs='gunicorn_django' -alias gk='kill `cat .gunicorn.pid`' # Environment variables ------------------------------------------------------ export EDITOR='vim' @@ -38,7 +24,6 @@ export HISTSIZE=1000 export HISTFILESIZE=1000 export HISTCONTROL=erasedups -export JPY="${HOME}/lib/j2/j.py" export PYTHONSTARTUP="$HOME/.pythonrc.py" export COMMAND_MODE=unix2003 export R_LIBS="$HOME/lib/r" @@ -53,9 +38,8 @@ source ~/lib/z/z.sh source ~/lib/python/virtualenvwrapper/virtualenvwrapper.sh -# Gorilla -------------------------------------------------------------------- -export PATH="/Users/sjl/src/gorilla/bin:$PATH" -export PYTHONPATH="/Users/sjl/src/gorilla/lib:$PYTHONPATH" +# See ------------------------------------------------------------------------ +export PYTHONPATH="$HOME/lib/python/see:$PYTHONPATH" # Pre-Prompt Command --------------------------------------------------------- function precmd () {