# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1334585730 14400
# Node ID c84b84dbac40d73cd45a01ea3253792dfefda535
# Parent  2d0147123d68d46eb941183a86360d7e3d3b9e7d
oh god

diff -r 2d0147123d68 -r c84b84dbac40 .hgsubstate
--- a/.hgsubstate	Sat Apr 14 10:01:00 2012 -0400
+++ b/.hgsubstate	Mon Apr 16 10:15:30 2012 -0400
@@ -30,5 +30,5 @@
 a8ce721701fdd015695406f7df315f48bb447ebb vim/bundle/vim-javascript
 f21fbd8759d7fa6c3cb1bbb9fe05eae90422f01a vim/bundle/vim-makegreen
 1c039193c59357dd09ddda28aefc6809bd0f90dc vim/bundle/vim-orgmode
-0a617f63ae49981b0184cc0edb978da820a581c6 vim/bundle/vitality
+6f31bf82bbcc528eb47c8c1a851a43c36233f6c1 vim/bundle/vitality
 e42cac0d8d84be5602109f4e614caa0854470fc1 vim/bundle/yankring
diff -r 2d0147123d68 -r c84b84dbac40 offlineimaprc
--- a/offlineimaprc	Sat Apr 14 10:01:00 2012 -0400
+++ b/offlineimaprc	Mon Apr 16 10:15:30 2012 -0400
@@ -25,15 +25,16 @@
 remoteuser = steve@stevelosh.com
 remotepasseval = get_keychain_pass(account="steve@stevelosh.com", server="imap.gmail.com")
 realdelete = no
-nametrans = lambda folder: re.sub('.*Drafts$', 'drafts',
-                           re.sub('.*Sent Mail$', 'sent',
-                           re.sub('.*Starred$', 'flagged',
-                           re.sub('.*Trash$', 'trash',
-                           re.sub('.*All Mail$', 'archive',
-                           folder)))))
+nametrans = lambda folder: {'[Gmail]/Drafts':    'drafts',
+                            '[Gmail]/Sent Mail': 'sent',
+                            '[Gmail]/Starred':   'flagged',
+                            '[Gmail]/Trash':     'trash',
+                            '[Gmail]/All Mail':  'archive',
+                            }.get(folder, folder)
 folderfilter = lambda folder: folder not in ['[Gmail]/Trash',
                                              'Nagios',
                                              'Flask',
                                              '[Gmail]/Important',
                                              '[Gmail]/Spam',
+                                             '[Gmail]/All Mail',
                                              ]
diff -r 2d0147123d68 -r c84b84dbac40 vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Sat Apr 14 10:01:00 2012 -0400
+++ b/vim/custom-dictionary.utf-8.add	Mon Apr 16 10:15:30 2012 -0400
@@ -6,3 +6,4 @@
 username
 Django
 Solr
+Losh
diff -r 2d0147123d68 -r c84b84dbac40 zshrc
--- a/zshrc	Sat Apr 14 10:01:00 2012 -0400
+++ b/zshrc	Mon Apr 16 10:15:30 2012 -0400
@@ -30,6 +30,7 @@
 export PATH="$HOME/bin:/usr/local/bin:/usr/local/sbin:/opt/local/bin:$PATH"
 export PATH="/opt/subversion/bin:${PATH}"
 export PATH="/usr/local/Cellar/ruby/1.9.2-p290/bin:${PATH}"
+export PATH="/usr/local/Cellar/ruby/1.9.3-p125/bin:${PATH}"
 export GREP_OPTIONS='--color=auto'
 export HISTSIZE=1000
 export HISTFILESIZE=1000