# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1349020861 14400
# Node ID 1d45e21ca4d76c3b38ed3b22b55a55e2a8898cf1
# Parent  055d8ae6e26f30f561973725bf65355891471595
Moar.

diff -r 055d8ae6e26f -r 1d45e21ca4d7 bash_profile
--- a/bash_profile	Sat Sep 29 14:16:13 2012 -0400
+++ b/bash_profile	Sun Sep 30 12:01:01 2012 -0400
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+shopt -s expand_aliases
+
+
 # This file contains aliases and functions that duplicate some fish
 # functionality, because Vim will use bash as its external command shell.
 
@@ -10,3 +13,5 @@
         ag $*
     fi
 }
+
+export PATH=~/bin:~/lib/dotfiles/bin:/usr/local/share/python:$PATH
diff -r 055d8ae6e26f -r 1d45e21ca4d7 bin/addcontact
--- a/bin/addcontact	Sat Sep 29 14:16:13 2012 -0400
+++ b/bin/addcontact	Sun Sep 30 12:01:01 2012 -0400
@@ -25,6 +25,10 @@
 -e "    set contactEmailLabel to firstEmailParam" \
 -e "    set contactEmail to secondEmailParam" \
 -e "  end if" \
+-e "  set bracketOffset to (offset of \"<\" in contactEmail)" \
+-e "  if (bracketOffset is not equal to 0) then" \
+-e "    set contactEmail to text 2 thru -2 of contactEmail" \
+-e "  end if" \
 -e "  if (contactEmailLabel is equal to \"\") then" \
 -e "    set contactEmailLabel to \"Home\"" \
 -e "  end if" \
diff -r 055d8ae6e26f -r 1d45e21ca4d7 bin/mutt-notmuch-py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/mutt-notmuch-py	Sun Sep 30 12:01:01 2012 -0400
@@ -0,0 +1,1 @@
+../../../src/mutt-notmuch-py/mutt-notmuch-py.py
\ No newline at end of file
diff -r 055d8ae6e26f -r 1d45e21ca4d7 fish/config.fish
--- a/fish/config.fish	Sat Sep 29 14:16:13 2012 -0400
+++ b/fish/config.fish	Sun Sep 30 12:01:01 2012 -0400
@@ -30,7 +30,7 @@
 alias spotlight-wat 'sudo fs_usage -w -f filesys mdworker | grep "open"'
 
 set MUTT_BIN (which mutt)
-alias mutt "bash -c 'cd ~/Desktop; $MUTT_BIN'"
+alias mutt "bash --login -c 'cd ~/Desktop; $MUTT_BIN'"
 
 alias h 'hg'
 alias g 'git'
@@ -166,7 +166,7 @@
 end
 
 function hg_prompt
-    # hg prompt --angle-brackets $hg_promptstring 2>/dev/null
+    hg prompt --angle-brackets $hg_promptstring 2>/dev/null
 end
 
 function git_prompt
diff -r 055d8ae6e26f -r 1d45e21ca4d7 moom/com.manytricks.Moom.plist
Binary file moom/com.manytricks.Moom.plist has changed
diff -r 055d8ae6e26f -r 1d45e21ca4d7 mutt/mailcap
--- a/mutt/mailcap	Sat Sep 29 14:16:13 2012 -0400
+++ b/mutt/mailcap	Sun Sep 30 12:01:01 2012 -0400
@@ -18,6 +18,7 @@
 application/msword; ~/.mutt/view_attachment.sh %s "-" '/Applications/TextEdit.app'
 
 # Images
+image/jpg; ~/.mutt/view_attachment.sh %s jpg
 image/jpeg; ~/.mutt/view_attachment.sh %s jpg
 image/pjpeg; ~/.mutt/view_attachment.sh %s jpg
 image/png; ~/.mutt/view_attachment.sh %s png
diff -r 055d8ae6e26f -r 1d45e21ca4d7 mutt/muttrc
--- a/mutt/muttrc	Sat Sep 29 14:16:13 2012 -0400
+++ b/mutt/muttrc	Sun Sep 30 12:01:01 2012 -0400
@@ -125,6 +125,7 @@
           +steve-stevelosh.com/archive \
           +steve-stevelosh.com/sent \
           +steve-stevelosh.com/drafts \
+          +temporary/search \
 
 # Other special folders.
 set mbox      = "+steve-stevelosh.com/archive"
@@ -144,30 +145,10 @@
 # }}}
 # Key Bindings {{{
 
-# Unbind Stupid Keys {{{
-
-bind index,pager \# noop
-bind index i        noop
-bind index w        noop
-
-# }}}
-# Pager {{{
-
-bind pager i  exit
-bind pager /  search
-bind pager k  previous-line
-bind pager j  next-line
-bind pager gg top
-bind pager G  bottom
-bind pager R  group-reply
-
-macro pager \Cu "|urlview<enter>" "call urlview to open links"
-macro pager s "<pipe-message>cat > ~/Desktop/"  "save message as"
-
-# }}}
 # Index {{{
 
-bind index R  group-reply
+bind index \#       noop
+bind index R        group-reply
 bind index <tab>    sync-mailbox
 bind index k        previous-entry
 bind index j        next-entry
@@ -175,15 +156,12 @@
 bind index G        last-entry
 bind index p        recall-message
 bind index <space>  collapse-thread
+bind index N        search-opposite
 macro index s "<pipe-message>cat > ~/Desktop/"  "save message as"
 
 # Mark all as read
 macro index \Cr "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
 
-# Quickly change date formats
-macro index <esc>f ":set date_format = \"%m/%d\"<enter>"             "short date format"
-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<enter>"           "run offlineimap to sync all mail"
 macro index o "<shell-escape>offlineimap -qf INBOX<enter>" "run offlineimap to sync inbox"
@@ -196,11 +174,26 @@
 macro index \' "<change-folder>+steve-stevelosh.com/INBOX<enter>"   "go to stevelosh/INBOX"
 macro index \" "<change-folder>+steve-stevelosh.com/archive<enter>" "go to stevelosh/archive"
 
-# Just use notmuch for everything
-macro index / "<enter-command>unset wait_key<enter><shell-escape>read -p 'notmuch query: ' x; echo \$x >~/.cache/mutt_terms<enter><limit>~i \"\`notmuch search --output=messages \$(cat ~/.cache/mutt_terms) | head -n 600 | tr '+' '.' | perl -le '@a=<>;chomp@a;s/\^id:// for@a;$,=\"|\";print@a'\`\"<enter>" "show only messages matching a notmuch pattern"
+# Search with notmuch
+macro index S "<enter-command>unset wait_key<enter><shell-escape>mutt-notmuch-py -G ~/.mail/temporary/search<enter><change-folder-readonly>+temporary/search<enter>" "search mail (using notmuch)"
+
+# Unlimit (show [a]ll)
+macro index a "<limit>all\n" "show all messages (undo limit)"
+
+# }}}
+# Pager {{{
 
-# Unlimit aka show [a]ll
-macro index a "<limit>all\n" "show all messages (undo limit)"
+bind pager \# noop
+bind pager k  previous-line
+bind pager j  next-line
+bind pager gg top
+bind pager G  bottom
+
+bind pager R  group-reply
+bind pager N  search-opposite
+
+macro pager \Cu "|urlview<enter>" "call urlview to open links"
+macro pager s "<pipe-message>cat > ~/Desktop/"  "save message as"
 
 # }}}
 # Compose {{{
diff -r 055d8ae6e26f -r 1d45e21ca4d7 vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Sat Sep 29 14:16:13 2012 -0400
+++ b/vim/custom-dictionary.utf-8.add	Sun Sep 30 12:01:01 2012 -0400
@@ -87,3 +87,7 @@
 SubtitleLanguage
 SubtitleLanguages
 signoff
+offline
+bikeshed
+bikesheds
+inbox
diff -r 055d8ae6e26f -r 1d45e21ca4d7 vim/vimrc
--- a/vim/vimrc	Sat Sep 29 14:16:13 2012 -0400
+++ b/vim/vimrc	Sun Sep 30 12:01:01 2012 -0400
@@ -760,12 +760,6 @@
     " Use <localleader>t to fold the current templatetag.
     au FileType html,jinja,htmldjango nmap <buffer> <localleader>t viikojozf
 
-    " Smarter pasting
-    au FileType html,jinja,htmldjango nnoremap <buffer> p :<C-U>YRPaste 'p'<CR>v`]=`]
-    au FileType html,jinja,htmldjango nnoremap <buffer> P :<C-U>YRPaste 'P'<CR>v`]=`]
-    au FileType html,jinja,htmldjango nnoremap <buffer> π :<C-U>YRPaste 'p'<CR>
-    au FileType html,jinja,htmldjango nnoremap <buffer> ∏ :<C-U>YRPaste 'P'<CR>
-
     " Indent tag
     au FileType html,jinja,htmldjango nnoremap <buffer> <localleader>= Vat=
 
@@ -956,8 +950,8 @@
 
 augroup ft_steveloshcom
     au!
-    au BufRead,BufNewFile */stevelosh/content/blog/20*/*/*.html set ft=markdown
-    au BufRead,BufNewFile */stevelosh/content/projects/*.html set ft=markdown
+    au BufRead,BufNewFile */stevelosh/content/blog/20*/*/*.html set ft=markdown spell
+    au BufRead,BufNewFile */stevelosh/content/projects/*.html set ft=markdown spell
 augroup END
 
 " }}}