# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1263002678 18000
# Node ID ab5f77a17eaafc927a8bda250d4f1f3e1221e398
# Parent  95b6f336d3ba65ea3e16dc0efd47192aab6e4d39# Parent  68f8629186f5fd55af5e935a3428ed40acba0d88
Merge with Macbook changes.

diff -r 68f8629186f5 -r ab5f77a17eaa .bashrc
--- a/.bashrc	Fri Jan 08 02:01:40 2010 -0500
+++ b/.bashrc	Fri Jan 08 21:04:38 2010 -0500
@@ -44,8 +44,6 @@
 source ~/.bash/prompt
 
 # Homebrew -------------------------------------------------------------------
-export PATH=`brew --prefix`/bin:$PATH
-export MANPATH=`brew --prefix`/share/man:$MANPATH
 if [ -f `brew --prefix`/etc/bash_completion ]; then
     . `brew --prefix`/etc/bash_completion
 fi
diff -r 68f8629186f5 -r ab5f77a17eaa .zshrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.zshrc	Fri Jan 08 21:04:38 2010 -0500
@@ -0,0 +1,14 @@
+# Path to your oh-my-zsh configuration.
+export ZSH=$HOME/lib/oh-my-zsh
+
+# Set to the name theme to load.
+# Look in ~/.oh-my-zsh/themes/
+export ZSH_THEME="prose"
+
+# Comment this out to disable weekly auto-update checks
+export DISABLE_AUTO_UPDATE="true"
+
+source $ZSH/oh-my-zsh.sh
+
+# Customize to your needs...
+export PATH="/usr/local/bin:~/lib/fmscripts:~/bin:${PATH}"
diff -r 68f8629186f5 -r ab5f77a17eaa zsh/example.zsh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zsh/example.zsh	Fri Jan 08 21:04:38 2010 -0500
@@ -0,0 +1,5 @@
+# Add yourself some shortcuts to projects you often work on
+# Example:
+#
+# brainstormr=/Users/robbyrussell/Projects/development/planetargon/brainstormr
+#
\ No newline at end of file
diff -r 68f8629186f5 -r ab5f77a17eaa zsh/mercurial.zsh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zsh/mercurial.zsh	Fri Jan 08 21:04:38 2010 -0500
@@ -0,0 +1,20 @@
+#!/usr/bin/env zsh
+
+alias mq='hg -R $(hg root)/.hg/patches'
+alias tmd='hg tmd | mate'
+
+function pull_everything() {
+    for repo in $( ls -1 ); do
+        if [[ -d $repo && -d $repo/.hg ]]; then
+            echo "Pulling" $repo
+            hg -R $repo pull -u
+            echo
+        fi
+    done
+}
+
+function_bitb() {
+    local P="$(hg paths 2>/dev/null | grep 'bitbucket.org' | head -1)"
+    local URL="$(echo $P | sed -e's|.*\(bitbucket.org.*\)|http://\1|')"
+    [[ -n $URL ]] && open $URL || echo "No BitBucket path found!"
+}
diff -r 68f8629186f5 -r ab5f77a17eaa zsh/pip.zsh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zsh/pip.zsh	Fri Jan 08 21:04:38 2010 -0500
@@ -0,0 +1,13 @@
+#!/usr/bin/env zsh
+
+export PIP_VIRTUALENV_BASE=$WORKON_HOME
+
+PIP_BIN="`which pip`"
+alias pip-sys="$PIP_BIN"
+
+pip() {
+    if [ -n "$VIRTUAL_ENV" ]
+    then $PIP_BIN -E "$VIRTUAL_ENV" "$@"
+    else echo "Not currently in a venv -- use pip-sys to work system-wide."
+    fi
+}
\ No newline at end of file
diff -r 68f8629186f5 -r ab5f77a17eaa zsh/subversion.zsh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zsh/subversion.zsh	Fri Jan 08 21:04:38 2010 -0500
@@ -0,0 +1,6 @@
+#!/usr/bin/env zsh
+
+# Accomodate the updated version of Subversion
+export DYLD_LIBRARY_PATH="/opt/subversion/lib:$DYLD_LIBRARY_PATH"
+export PYTHONPATH="/opt/subversion/lib/svn-python:$PYTHONPATH"
+export PATH="/opt/subversion/bin:$PATH"
\ No newline at end of file
diff -r 68f8629186f5 -r ab5f77a17eaa zsh/tasks.zsh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zsh/tasks.zsh	Fri Jan 08 21:04:38 2010 -0500
@@ -0,0 +1,16 @@
+#!/usr/bin/env zsh
+
+alias t='~/src/t/t.py --task-dir="~/tasks"'
+alias m='~/src/t/t.py --task-dir="~/tasks" --list=music'
+alias g='~/src/t/t.py --task-dir="~/tasks" --list=groceries'
+alias k='~/src/t/t.py --task-dir="~/tasks" --list=books'
+alias p='~/src/t/t.py --task-dir="~/tasks" --list=pack'
+alias b='~/src/t/t.py --list=bugs'
+
+alias pa='~/src/t/t.py --task-dir="~/tasks" --list=pack-archive'
+function packfor() {
+    cp "$HOME/tasks/pack-archive" "$HOME/tasks/pack";
+    touch "$HOME/tasks/.pack.done"
+    hg --cwd ~/tasks add 'pack' '.pack.done';
+    hg -R ~/tasks commit -m 'Starting to pack.'
+}