# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1276208717 14400
# Node ID 1a3ee92103ed85667e50d1b0ccca198bf9f8785d
# Parent  7ee2661d5bd84bb9f70dc1472a8c863bcc672f2d
Cleanup before going public.

diff -r 7ee2661d5bd8 -r 1a3ee92103ed .ackrc
--- a/.ackrc	Thu Jun 10 17:53:17 2010 -0400
+++ b/.ackrc	Thu Jun 10 18:25:17 2010 -0400
@@ -2,3 +2,5 @@
 log=.log
 --type-set
 django=.py,.html
+--type-set
+less=.less
diff -r 7ee2661d5bd8 -r 1a3ee92103ed .bash_profile
--- a/.bash_profile	Thu Jun 10 17:53:17 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source ~/.bashrc
-
diff -r 7ee2661d5bd8 -r 1a3ee92103ed .gitconfig
--- a/.gitconfig	Thu Jun 10 17:53:17 2010 -0400
+++ b/.gitconfig	Thu Jun 10 18:25:17 2010 -0400
@@ -26,8 +26,3 @@
 diff = auto
 interactive = auto
 status = auto
-
-[codebase]
-username = steve
-apikey = zl2b3od1ln9g23438nhvug0yoppe5lkia9ro3pun
-domain = dwaiter.codebasehq.com
diff -r 7ee2661d5bd8 -r 1a3ee92103ed .hgignore
--- a/.hgignore	Thu Jun 10 17:53:17 2010 -0400
+++ b/.hgignore	Thu Jun 10 18:25:17 2010 -0400
@@ -4,5 +4,6 @@
 *.pyc
 .netrwhist
 *.swp
+*.swo
 tags
 config/bcvi
diff -r 7ee2661d5bd8 -r 1a3ee92103ed .hgrc
--- a/.hgrc	Thu Jun 10 17:53:17 2010 -0400
+++ b/.hgrc	Thu Jun 10 18:25:17 2010 -0400
@@ -36,10 +36,9 @@
 
 [diff]
 git = True
-unified = 10
+unified = 5
 
 [extdiff]
-cmd.fmdiff = fmdiff
 cmd.vd = mvim
 opts.vd = -c 'set lines=70' -c 'set columns=240' -f '+next' '+execute "DirDiff" argv(0) argv(1)'
 cmd.kd = /usr/local/bin/ksdiff-wrapper
@@ -55,10 +54,6 @@
 username = sjl
 tls = True
 
-[web]
-allow_archive = gz zip bz2
-motd = more info at <a href="http://stevelosh.com/projects/">stevelosh.com/projects</a>
-
 [color]
 status.modified = cyan
 status.added = green
@@ -80,9 +75,6 @@
 track.current = True
 
 [defaults]
-diff   = --color auto
-status = --color auto
-serve  = --style=gitweb
 rebase = --keepbranches
 addremove = --similarity 100
 
@@ -107,26 +99,24 @@
 
 ks = kd -c
 
-dlog = log --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.dlog
+dlog = log --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.dlog
 _ = dlog -l15
 __ = _ -l100000000
-o_ = outgoing -n --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.dlog
-i_ = incoming -n --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.dlog
+o_ = outgoing -n --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.dlog
+i_ = incoming -n --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.dlog
 
-slog = log --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.slog
+slog = log --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.slog
 . = slog -l15
 .. = . -l100000000
-o. = outgoing -n --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.slog
-i. = incoming -n --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.slog
+o. = outgoing -n --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.slog
+i. = incoming -n --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.slog
 
-sglog = glog --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.sglog
+sglog = glog --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.sglog
 , = sglog -l7
 ,, = , -l100000000
-o, = outgoing --graph --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.sglog
-i, = incoming --graph --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.sglog
+o, = outgoing --graph --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.sglog
+i, = incoming --graph --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.sglog
 
-nlog = log --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.nlog
+nlog = log --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.nlog
 n = nlog -vr
 show = nlog --color=always -vpr
-
-qcm = qcommit -m 
diff -r 7ee2661d5bd8 -r 1a3ee92103ed .zshrc
--- a/.zshrc	Thu Jun 10 17:53:17 2010 -0400
+++ b/.zshrc	Thu Jun 10 18:25:17 2010 -0400
@@ -9,7 +9,6 @@
 # Useful aliases -------------------------------------------------------------
 alias j='z'
 alias fab='fab -i ~/.ssh/stevelosh'
-alias tweets-stevelosh='~/src/grabtweets/grabtweets.py -p ~/Documents/tweets/stevelosh'
 alias oldgcc='export CC=/usr/bin/gcc-4.0'
 
 # Environment variables ------------------------------------------------------
diff -r 7ee2661d5bd8 -r 1a3ee92103ed bootstrap.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bootstrap.sh	Thu Jun 10 18:25:17 2010 -0400
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+# THIS IS A WORK IN PROGRESS
+# BE CAREFUL, DAMMIT
+
+# Don't forget the SSH keys.
+
+mkdir -p lib/hg
+mkdir -p lib/python
+mkdir -p lib/virtualenvs
+mkdir bin
+mkdir src
+
+echo '#!/usr/bin/env python' > bin/batcharge.py
+echo 'pass' >> bin/batcharge.py
+chmod u+x bin/batcharge.py
+
+wget 'http://mercurial.selenic.com/release/mercurial-1.5.tar.gz'
+tar xzf mercurial-1.5.tar.gz
+cd mercurial-1.5
+make local
+
+./hg clone 'http://selenic.com/repo/hg#stable' ~/lib/hg/hg-stable
+cd ~/lib/hg/hg-stable
+make local
+cd
+export PATH="$PATH:$HOME/lib/hg/hg-stable"
+rm -rf mercurial-1.5 mercurial-1.5.tar.gz
+
+hg clone http://bitbucket.org/sjl/dotfiles ~/lib/dotfiles
+git clone git://github.com/sjl/oh-my-zsh ~/lib/oh-my-zsh
+git clone git://github.com/sjl/z-zsh ~/lib/z
+
+hg clone http://bitbucket.org/dhellmann/virtualenvwrapper ~/lib/python/virtualenvwrapper
+cd ~/lib/python/virtualenvwrapper
+sudo python setup.py develop
+cd
+
+hg clone http://bitbucket.org/agr/rope ~/lib/python/rope
+cd ~/lib/python/rope
+sudo python setup.py develop
+cd
+
+rm -rf ~lib/oh-my-zsh/custom
+ln -s "$HOME/lib/dotfiles/zsh $HOME/lib/oh-my-zsh/custom"
+
+ln -s "$HOME/lib/dotfiles/.ackrc $HOME/.ackrc"
+ln -s "$HOME/lib/dotfiles/.gitconfig $HOME/.gitconfig"
+ln -s "$HOME/lib/dotfiles/.hgrc $HOME/.hgrc"
+ln -s "$HOME/lib/dotfiles/vim/.vim $HOME/.vim"
+ln -s "$HOME/lib/dotfiles/vim/.vimrc $HOME/.vimrc"
+
+rm ~/.zshrc
+ln -s "$HOME/lib/dotfiles/.zshrc $HOME/.zshrc"
+
+hg clone bb://sjl/hg-prompt/ "$HOME/lib/hg/hg-prompt"
+hg clone bb://sjl/hg-paste/ "$HOME/lib/hg/hg-paste"
+hg clone bb://sjl/hg-review/ "$HOME/lib/hg/hg-review"
+hg clone bb://ccaughie/hgcollapse/ "$HOME/lib/hg/hgcollapse"
+hg clone bb://tksoh/hgshelve/ "$HOME/lib/hg/hgshelve"
+hg clone bb://durin42/histedit/ "$HOME/lib/hg/histedit"
+hg clone bb://durin42/hg-git/ "$HOME/lib/hg/hg-git"
+
+git clone git://github.com/jelmer/dulwich.git "$HOME/lib/dulwich"
+ln -s "$HOME/lib/dulwich/dulwich $HOME/lib/hg/hg-stable/dulwich"
diff -r 7ee2661d5bd8 -r 1a3ee92103ed vim/.gvimrc
--- a/vim/.gvimrc	Thu Jun 10 17:53:17 2010 -0400
+++ b/vim/.gvimrc	Thu Jun 10 18:25:17 2010 -0400
@@ -9,3 +9,5 @@
 end
 
 let g:sparkupExecuteMapping = '<D-e>'
+
+highlight SpellBad term=underline gui=undercurl guisp=Orange
diff -r 7ee2661d5bd8 -r 1a3ee92103ed vim/.vimrc
--- a/vim/.vimrc	Thu Jun 10 17:53:17 2010 -0400
+++ b/vim/.vimrc	Thu Jun 10 18:25:17 2010 -0400
@@ -9,6 +9,7 @@
 set softtabstop=4
 set expandtab
 
+" Basic options
 set scrolloff=3
 set autoindent
 set smartindent
@@ -20,6 +21,9 @@
 set visualbell
 set cursorline
 set ttyfast
+set ruler
+set backspace=indent,eol,start
+set nu
 
 " Backups
 set backupdir=~/tmp,/tmp " backups (~)
@@ -49,16 +53,10 @@
 set textwidth=79
 set formatoptions=qrn1
 
-set ruler
-set backspace=indent,eol,start
-
 " Use the same symbols as TextMate for tabstops and EOLs
 set list
 set listchars=tab:▸\ ,eol:¬
 
-" Line numbers
-set nu
-
 " Color scheme (terminal)
 syntax on
 set background=dark
@@ -66,9 +64,11 @@
 
 " Use Pathogen to load bundles
 call pathogen#runtime_append_all_bundles()
-cmap HALP call pathogen#helptags()<CR>
+cab HALP call pathogen#helptags()<CR>
 
+" NERD Tree
 map <F2> :NERDTreeToggle<CR>
+let NERDTreeIgnore=['.vim$', '\~$', '.*\.pyc$', 'pip-log\.txt$']
 
 " Use the damn hjkl keys
 map <up> <nop>
@@ -82,11 +82,6 @@
 map <C-k> <C-w>k
 map <C-l> <C-w>l
 
-map <D-h> :vertical resize -10<CR>
-map <D-j> :resize -10<CR>
-map <D-k> :resize +10<CR>
-map <D-l> :vertical resize +10<CR>
-
 " Folding
 set foldlevelstart=1
 nnoremap <F1> za
@@ -110,13 +105,9 @@
     return line . '…' . repeat(" ",fillcharcount) . foldedlinecount . '…' . ' '
 endfunction
 
-
 " Fuck you, help key.
 imap <F1> <nop>
 
-" NERDTree ignore filters
-let NERDTreeIgnore=['.vim$', '\~$', '.*\.pyc$', 'pip-log\.txt$']
-
 " Various syntax stuff
 au BufNewFile,BufRead *.less set filetype=less
 au BufNewFile,BufRead *.less set foldmethod=marker
@@ -133,8 +124,8 @@
 " Exuberant ctags!
 let Tlist_Ctags_Cmd = "/usr/local/bin/ctags"
 let Tlist_WinWidth = 50
-map <F3> :TlistToggle<cr>
-map <F4> :!/usr/local/bin/ctags -R --c++-kinds=+p --fields=+iaS --extra=+q .<CR>
+map <F4> :TlistToggle<cr>
+map <F5> :!/usr/local/bin/ctags -R --c++-kinds=+p --fields=+iaS --extra=+q .<CR>
 
 " Ropevim
 let $PYTHONPATH .= ":" . $HOME . "/lib/python/rope"
@@ -144,10 +135,5 @@
 " Ack
 map <leader>a :Ack 
 
-" Spellbad Coloring
-if has("gui_running")
-    highlight SpellBad term=underline gui=undercurl guisp=Orange
-endif
-
 " Yankring
 nnoremap <silent> <F3> :YRShow<CR>
diff -r 7ee2661d5bd8 -r 1a3ee92103ed zsh/example.zsh
--- a/zsh/example.zsh	Thu Jun 10 17:53:17 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# 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 7ee2661d5bd8 -r 1a3ee92103ed zsh/mercurial.zsh
--- a/zsh/mercurial.zsh	Thu Jun 10 17:53:17 2010 -0400
+++ b/zsh/mercurial.zsh	Thu Jun 10 18:25:17 2010 -0400
@@ -1,12 +1,5 @@
 #!/usr/bin/env zsh
 
-alias mq='hg -R $(hg root)/.hg/patches'
-function tmd () {
-    hg diff --no-color | mate
-}
-function tms () {
-    hg show $1 | sed -E -e "s/\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]//g" | mate
-}
 alias calctime="sed -e 's/{t: *\([0-9]*\)*.*/\1/' | python -c 'import sys; print sum(map(int, sys.stdin.readlines())) / 60.0, \"hours\"'"
 alias hgt='hg log -vd "`date -j \"+%Y-%m-%d\"`" -u steve | grep "{t:" | calctime'
 
@@ -19,9 +12,3 @@
         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!"
-}