# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1325630521 18000
# Node ID ee72ecd7bd494a20aaec6196991e74e4ce5ba26d
# Parent  4f121b1035e89fc033874f7d3f73ec73ff27c08c
Moar.

diff -r 4f121b1035e8 -r ee72ecd7bd49 .hgsubstate
--- a/.hgsubstate	Tue Dec 27 15:09:02 2011 -0500
+++ b/.hgsubstate	Tue Jan 03 17:42:01 2012 -0500
@@ -5,7 +5,7 @@
 bf03741650aae253b9fbfdb5526d6a7b818a060d vim/bundle/ctrlp
 cdecdc56f938840cad250aecd58c1901f04c4d1b vim/bundle/easymotion
 b4b75ef682da3e946c648d3634ade39d0af49aba vim/bundle/fugitive
-91190e67720f852c17602504d5225d4e675b6499 vim/bundle/gundo
+2a78f151df54b53874f0aa6a85cfdad6ead224ed vim/bundle/gundo
 4ef2d418f48d30fed2f7ce00f598d6871a0010fe vim/bundle/html5
 78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e vim/bundle/indent-object
 75ab8c11b56aae8e35f211d96fb008efb1ab946a vim/bundle/linediff
diff -r 4f121b1035e8 -r ee72ecd7bd49 dotcss/unisubs.example.com.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dotcss/unisubs.example.com.css	Tue Jan 03 17:42:01 2012 -0500
@@ -0,0 +1,3 @@
+body > div.note {
+    display: none;
+}
diff -r 4f121b1035e8 -r ee72ecd7bd49 keymando/keymandorc.rb
--- a/keymando/keymandorc.rb	Tue Dec 27 15:09:02 2011 -0500
+++ b/keymando/keymandorc.rb	Tue Jan 03 17:42:01 2012 -0500
@@ -10,23 +10,33 @@
 # Application Switching ------------------------------------------------------------
 map "<Ctrl-Shift-J>", lambda { activate('Firefox') }
 map "<Ctrl-Shift-K>", lambda { activate('MacVim') }
+map "<Ctrl-Shift-H>", lambda { activate('iTerm') }
+map "<Ctrl-Shift-O>", lambda { activate('Rdio') }
+map "<Ctrl-Shift-Y>", lambda { activate('Twitter') }
+
 map "<Ctrl-Shift-M>" do
-    activate('iTerm')
+    activate('iDvtm')
     sleep(1)
     send('<Ctrl-f>')
     send('3')
 end
-map "<Ctrl-Shift-G>" do
-    activate('iTerm')
+map "<Ctrl-Shift-I>" do
+    activate('iDvtm')
+    sleep(1)
+    send('<Ctrl-f>')
+    send('2')
+end
+map "<Ctrl-Shift-N>" do
+    activate('iDvtm')
     sleep(1)
     send('<Ctrl-f>')
     send('1')
 end
 
 # Leader ---------------------------------------------------------------------------
-map "<Ctrl-,>" do
-    input()
-end
+# map "<Ctrl-,>" do
+#     input()
+# end
 
 # Abbreviations --------------------------------------------------------------------
 
diff -r 4f121b1035e8 -r ee72ecd7bd49 vim/.vimrc
--- a/vim/.vimrc	Tue Dec 27 15:09:02 2011 -0500
+++ b/vim/.vimrc	Tue Jan 03 17:42:01 2012 -0500
@@ -48,6 +48,7 @@
 set shiftround
 set autoread
 set title
+set linebreak
 set dictionary=/usr/share/dict/words
 
 " Wildmenu completion {{{
@@ -632,6 +633,9 @@
     " Jesus tapdancing Christ, built-in Python syntax, you couldn't let me
     " override this in a normal way, could you?
     au FileType python if exists("python_space_error_highlight") | unlet python_space_error_highlight | endif
+
+    " Jesus, Python.  Five characters of punctuation for a damn string?
+    au FileType python inoremap <buffer> <d-'> _(u'')<left><left>
 augroup END
 
 " }}}
@@ -717,11 +721,12 @@
 " }}}
 " Convenience mappings ---------------------------------------------------- {{{
 
-" Clean whitespace
-map <leader>W  :%s/\s\+$//<cr>:let @/=''<CR>
+" Clean trailing whitespace
+nnoremap <leader>w :%s/\s\+$//<cr>:let @/=''<cr>
 
-" Dammit, Slimv
-map <leader>WW :%s/\s\+$//<cr>:let @/=''<CR>
+" Send visual selection to gist.github.com as a private, filetyped Gist
+" Requires the gist command line too (brew install gist)
+vnoremap <leader>G :w !gist -p -t %:e \| pbcopy<cr>
 
 " Change case
 nnoremap <C-u> gUiw
@@ -746,8 +751,9 @@
 " Easier linewise reselection
 nnoremap <leader>V V`]
 
-" Jesus, Python.
-inoremap <d-'> _(u'')<left><left>
+" Split line (sister to [J]oin lines)
+" The normal use of S is covered by cc, so don't worry about shadowing it.
+nnoremap S i<cr><esc><right>
 
 " Preview Files
 nnoremap <leader>p :w<cr>:Hammer<cr>
@@ -1042,7 +1048,7 @@
 let g:pymode_lint = 0
 let g:pymode_breakpoint = 0
 let g:pymode_utils_whitespaces = 0
-let g:pymode_virtualenv = 1
+let g:pymode_virtualenv = 0
 
 let g:pymode_options_indent = 0
 let g:pymode_options_fold = 0