# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1297296344 18000
# Node ID eb6884839822d350f610288cd0ba74dac1057518
# Parent  2467bc6709cbce66e81c2f4bf7ea9835c52a2fc8# Parent  f72bf0f65204849d0c734837c89d34791b75a678
Merge.

diff -r 2467bc6709cb -r eb6884839822 .hgrc
diff -r 2467bc6709cb -r eb6884839822 vim/.vimrc
--- a/vim/.vimrc	Tue Feb 08 21:17:13 2011 -0500
+++ b/vim/.vimrc	Wed Feb 09 19:05:44 2011 -0500
@@ -32,6 +32,7 @@
 set nonumber
 set norelativenumber
 set laststatus=2
+set history=1000
 set undofile
 set undoreload=10000
 set cpoptions+=J
@@ -62,6 +63,7 @@
 " }}}
 " Backups {{{
 
+set undodir=~/.vim/tmp/undo//     " undo files
 set backupdir=~/.vim/tmp/backup// " backups
 set directory=~/.vim/tmp/swap//   " swap files
 set backup                        " enable backups
@@ -103,6 +105,16 @@
 nnoremap Y y$
 nnoremap D d$
 
+nnoremap n nzz
+nnoremap N Nzz
+
+vnoremap < <gv
+vnoremap > >gv
+
+nnoremap L $
+vnoremap L $
+onoremap L $
+
 " Directional Keys {{{
 
 " Why stretch?
@@ -290,6 +302,12 @@
 " Toggle paste
 nnoremap <f8> :set paste!<cr>
 
+" I can't type
+cmap W w
+cmap Wa wa
+cmap WA wa
+cmap Wq wq
+
 " }}}
 " Plugin Settings ------------------------------------------------------------- {{{
 
@@ -348,6 +366,8 @@
 
 onoremap id i[
 onoremap ad a[
+vnoremap id i[
+vnoremap ad a[
 
 " }}}
 " Next () {{{
diff -r 2467bc6709cb -r eb6884839822 vim/tmp/undo/.placeholder
diff -r 2467bc6709cb -r eb6884839822 zsh/bcvi.zsh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zsh/bcvi.zsh	Wed Feb 09 19:05:44 2011 -0500
@@ -0,0 +1,4 @@
+#!/usr/bin/env zsh
+
+alias ss='bcvi --wrap-ssh -- '
+alias bcvid='dtach -A /tmp/bcvi.socket bcvi --listener'