# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1344001513 14400
# Node ID 2afb56feb14601470a5151e017b028ecf672c74c
# Parent  cbbbc897e9b3943e78fcc5f980f9f6213f33fe86
Moar.

diff -r cbbbc897e9b3 -r 2afb56feb146 fish/virtualenv.fish
--- a/fish/virtualenv.fish	Wed Jul 25 15:20:18 2012 -0400
+++ b/fish/virtualenv.fish	Fri Aug 03 09:45:13 2012 -0400
@@ -23,6 +23,7 @@
        set -e PYTHONHOME
     end
 
+    cd -
     echo "activated $tgt"
   else
     echo "$tgt not found"
diff -r cbbbc897e9b3 -r 2afb56feb146 gitconfig
--- a/gitconfig	Wed Jul 25 15:20:18 2012 -0400
+++ b/gitconfig	Fri Aug 03 09:45:13 2012 -0400
@@ -31,8 +31,8 @@
     ci = commit
     cm = commit -m
 
-    d = diff
-    di = diff --cached
+    d = !git diff | vim -R -
+    di = !git diff --cached | vim -R -
 
     co = checkout
     id = rev-parse
diff -r cbbbc897e9b3 -r 2afb56feb146 keymando/keymandorc.rb
--- a/keymando/keymandorc.rb	Wed Jul 25 15:20:18 2012 -0400
+++ b/keymando/keymandorc.rb	Fri Aug 03 09:45:13 2012 -0400
@@ -21,14 +21,12 @@
 map "<Ctrl-Shift-M>" do
     activate('iTerm')
     send('<Cmd-Option-1>')
-    send('<Ctrl-f>2')
+    send('<Ctrl-f>')
     send('2')
 end
 map "<Ctrl-Shift-I>" do
     activate('iTerm')
-    send('<Cmd-Option-1>')
-    send('<Ctrl-f>')
-    send('1')
+    send('<Cmd-Option-1><Ctrl-f>1')
 end
 
 # Refresh ---------------------------------------------------------------------
diff -r cbbbc897e9b3 -r 2afb56feb146 keyremap4macbook/private.xml
--- a/keyremap4macbook/private.xml	Wed Jul 25 15:20:18 2012 -0400
+++ b/keyremap4macbook/private.xml	Fri Aug 03 09:45:13 2012 -0400
@@ -2,6 +2,15 @@
 <root>
     <list>
         <item>
+            <name>sjl Simuletion (f+j simultaneously to delete, f+k to option-delete)</name>
+            <identifier>private.simuletion</identifier>
+            <autogen>--SimultaneousKeyPresses-- KeyCode::F, KeyCode::J, KeyCode::DELETE</autogen>
+            <autogen>--SimultaneousKeyPresses-- KeyCode::F, KeyCode::K, KeyCode::DELETE, ModifierFlag::OPTION_L</autogen>
+        </item>
+    </list>
+
+    <list>
+        <item>
             <name>sjl Swap parens and brackets</name>
             <identifier>private.swap_parens_and_brackets</identifier>
             <autogen>--KeyToKey-- KeyCode::BRACKET_LEFT,  ModifierFlag::NONE, KeyCode::KEY_9, ModifierFlag::SHIFT_R</autogen>
@@ -40,7 +49,7 @@
 
     <list>
         <item>
-            <name>sjl Use the correct goddamed shift keys.</name>
+            <name>sjl Use the correct goddamned shift keys.</name>
             <identifier>private.fucking_shift_keys_how_do_they_work</identifier>
 
             <autogen>--KeyToKey-- KeyCode::Q, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
diff -r cbbbc897e9b3 -r 2afb56feb146 moom/com.manytricks.Moom.plist
Binary file moom/com.manytricks.Moom.plist has changed
diff -r cbbbc897e9b3 -r 2afb56feb146 mutt/muttrc
--- a/mutt/muttrc	Wed Jul 25 15:20:18 2012 -0400
+++ b/mutt/muttrc	Fri Aug 03 09:45:13 2012 -0400
@@ -185,8 +185,8 @@
 macro index <esc>F ":set date_format = \"%m/%d at %I:%M %P\"<enter>" "long date format"
 
 # Sync email
-macro index O "<shell-escape>offlineimap -q<enter>"                   "run offlineimap to sync mail in the foreground"
-macro index o "<shell-escape>offlineimap -q >/dev/null 2>&1 &<enter>" "run offlineimap to sync mail in the background"
+macro index O "<shell-escape>offlineimap<enter>"           "run offlineimap to sync all mail"
+macro index o "<shell-escape>offlineimap -qf INBOX<enter>" "run offlineimap to sync inbox"
 
 # Saner copy/move dialogs
 macro index C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
diff -r cbbbc897e9b3 -r 2afb56feb146 vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Wed Jul 25 15:20:18 2012 -0400
+++ b/vim/custom-dictionary.utf-8.add	Fri Aug 03 09:45:13 2012 -0400
@@ -80,3 +80,5 @@
 symlink
 Backblaze
 README
+Coursera
+OAuth
diff -r cbbbc897e9b3 -r 2afb56feb146 vim/vimrc
--- a/vim/vimrc	Wed Jul 25 15:20:18 2012 -0400
+++ b/vim/vimrc	Fri Aug 03 09:45:13 2012 -0400
@@ -244,6 +244,10 @@
 " Unfuck my screen
 nnoremap <leader>u :syntax sync fromstart<cr>:redraw!<cr>
 
+" Tabs
+nnoremap <leader>( :tabprev<cr>
+nnoremap <leader>) :tabnext<cr>
+
 " System clipboard interaction.  Mostly from:
 " https://github.com/henrik/dotfiles/blob/master/vim/config/mappings.vim
 noremap <leader>y "*y