# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1267657357 18000
# Node ID 8a80c95ddbc41e801e3eb0a759f97034986fa9bf
# Parent  0f2d16a931f33d650d49ca4cbb8ae9a1ef5e543f# Parent  be94a1161989ce0ed08ebddc46ceb0dd678a1049
Merge.

diff -r 0f2d16a931f3 -r 8a80c95ddbc4 .hgrc
--- a/.hgrc	Wed Mar 03 18:02:20 2010 -0500
+++ b/.hgrc	Wed Mar 03 18:02:37 2010 -0500
@@ -18,6 +18,7 @@
 paste = ~/lib/hg/hg-paste/paste.py
 prompt = ~/lib/hg/hg-prompt/prompt.py
 histedit = ~/lib/hg/histedit
+hgsubversion = ~/lib/hg/hgsubversion/hgsubversion
 hggit = ~/lib/hg/hg-git/hggit
 collapse = ~/lib/hg/hgcollapse/hgext/collapse.py
 review = ~/lib/hg/hg-review/review
diff -r 0f2d16a931f3 -r 8a80c95ddbc4 .zshrc
--- a/.zshrc	Wed Mar 03 18:02:20 2010 -0500
+++ b/.zshrc	Wed Mar 03 18:02:37 2010 -0500
@@ -13,7 +13,6 @@
 alias pm='python manage.py'
 alias oo='open .'
 alias j='z'
-alias flakes="find . -name '*.py' -print0 | xargs -0 pyflakes"
 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"
@@ -21,11 +20,15 @@
 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'
 
 # Environment variables ------------------------------------------------------
 export EDITOR='vim'
 export PATH="/usr/local/bin:/usr/local/sbin:$HOME/lib/fmscripts:$HOME/bin:$PATH"
 export PATH="$HOME/.gem/ruby/1.8/bin:${PATH}"
+export PATH="/opt/subversion/bin:${PATH}"
 export PATH="${PATH}:/usr/local/Cellar/PyPi/3.6/bin"
 export PATH="${PATH}:/usr/local/Cellar/python/2.6.4/bin"
 export WORKON_HOME="${HOME}/lib/virtualenvs"
@@ -38,6 +41,7 @@
 export COMMAND_MODE=unix2003
 export R_LIBS="$HOME/lib/r"
 export BAT_CHARGE="$HOME/bin/batcharge.py"
+export RUBYOPT=rubygems
 
 # Mercurial variables --------------------------------------------------------
 export PATH="$HOME/lib/hg/hg-stable:$PATH"
diff -r 0f2d16a931f3 -r 8a80c95ddbc4 zsh/misc.zsh
--- a/zsh/misc.zsh	Wed Mar 03 18:02:20 2010 -0500
+++ b/zsh/misc.zsh	Wed Mar 03 18:02:37 2010 -0500
@@ -1,2 +1,4 @@
 alias pbc='pbcopy'
-alias pbp='pbpaste'
\ No newline at end of file
+alias pbp='pbpaste'
+
+source ~/lib/colfm/colfm.zsh
\ No newline at end of file