# HG changeset patch # User Steve Losh # Date 1342987393 14400 # Node ID 553d109e7c6195e927c0d69c4fb9a0a3e37aa89b # Parent b5786e25b18d32128cf265562b6e7bbdeded9af5 MOAR diff -r b5786e25b18d -r 553d109e7c61 .hgsubstate --- a/.hgsubstate Sun Jul 22 16:02:59 2012 -0400 +++ b/.hgsubstate Sun Jul 22 16:03:13 2012 -0400 @@ -23,7 +23,7 @@ 7f53b5c3919bde9a4259d0c725d453ef2337a4ed vim/bundle/powerline 9f976bb5754fd1252198fd1d8da4508a1a612ef6 vim/bundle/python-mode f060c485ee2631430ba19634e4a1c4d593065211 vim/bundle/salt -94c0fd36649d8c3db3e3cd53fad37a3c5ce3f7c5 vim/bundle/slimv +e06a7191df1257765cf605d42b326d22d34e4f46 vim/bundle/slimv 78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 vim/bundle/smartinput c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup 3a2ab096c039516a8f43e6acd0264d8a81cd0544 vim/bundle/splice diff -r b5786e25b18d -r 553d109e7c61 dotcss/flickr.com.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dotcss/flickr.com.css Sun Jul 22 16:03:13 2012 -0400 @@ -0,0 +1,6 @@ +body { + background: green !important; +} +.spaceball { + display: none !important; +} diff -r b5786e25b18d -r 553d109e7c61 dotcss/secure.flickr.com.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dotcss/secure.flickr.com.css Sun Jul 22 16:03:13 2012 -0400 @@ -0,0 +1,1 @@ +flickr.com.css \ No newline at end of file diff -r b5786e25b18d -r 553d109e7c61 dotjs/flickr.com.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dotjs/flickr.com.js Sun Jul 22 16:03:13 2012 -0400 @@ -0,0 +1,3 @@ +$(function() { + $('.spaceball').remove(); +}) diff -r b5786e25b18d -r 553d109e7c61 dotjs/secure.flickr.com.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dotjs/secure.flickr.com.js Sun Jul 22 16:03:13 2012 -0400 @@ -0,0 +1,1 @@ +flickr.com.js \ No newline at end of file diff -r b5786e25b18d -r 553d109e7c61 fish/config.fish --- a/fish/config.fish Sun Jul 22 16:02:59 2012 -0400 +++ b/fish/config.fish Sun Jul 22 16:03:13 2012 -0400 @@ -27,7 +27,7 @@ alias spotlight-wat 'sudo fs_usage -w -f filesys mdworker | grep "open"' set MUTT_BIN (which mutt) -alias mutt "cd ~/Desktop; $MUTT_BIN" +alias mutt "bash -c 'cd ~/Desktop; $MUTT_BIN'" alias h 'hg' alias g 'git' diff -r b5786e25b18d -r 553d109e7c61 moom/com.manytricks.Moom.plist Binary file moom/com.manytricks.Moom.plist has changed diff -r b5786e25b18d -r 553d109e7c61 mutt/Equifax_Secure_CA.cert --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mutt/Equifax_Secure_CA.cert Sun Jul 22 16:03:13 2012 -0400 @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE----- +MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEQMA4GA1UE +ChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5 +MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoT +B0VxdWlmYXgxLTArBgNVBAsTJEVxdWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCB +nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPR +fM6fBeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+AcJkVV5MW +8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kCAwEAAaOCAQkwggEFMHAG +A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UE +CxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoG +A1UdEAQTMBGBDzIwMTgwODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvS +spXXR9gjIBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQFMAMB +Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAFjOKer89961 +zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y7qj/WsjTVbJmcVfewCHrPSqnI0kB +BIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95 +70+sB3c4 +-----END CERTIFICATE----- \ No newline at end of file diff -r b5786e25b18d -r 553d109e7c61 mutt/muttrc --- a/mutt/muttrc Sun Jul 22 16:02:59 2012 -0400 +++ b/mutt/muttrc Sun Jul 22 16:03:13 2012 -0400 @@ -1,30 +1,38 @@ -# directories and commands +# Paths {{{ + set alias_file = ~/.mutt/alias # alias file set header_cache = ~/.mutt/cache/headers # where to store headers set message_cachedir = ~/.mutt/cache/bodies # where to store bodies set certificate_file = ~/.mutt/certificates # where to store certs -set mailcap_path = ~/.mutt/mailcap # entrys for filetypes +set mailcap_path = ~/.mutt/mailcap # entries for filetypes set signature = ~/.mutt/sig # my signature file set tmpdir = ~/.mutt/temp # where to keep temp files -set print_command = /usr/bin/enscript # print with enscript + +# }}} +# Editor {{{ # Use Vim to compose email, with a few default options. -set editor = "vim +/^$ +:s/^$/\\\\r\\\\r/ +:noh -c 'normal! k' -c 'set nolist' -c 'redraw'" +set editor = "vim -c 'normal! }' -c 'redraw'" + +# }}} +# Contacts {{{ # Use the OS X address book -# set query_command = "lbdbq '%s' | sed -e 's/(null)//g'" set query_command = "contacts -Sf '%eTOKEN%n' '%s' | sed -e 's/TOKEN/\t/g'" bind editor complete-query bind editor ^T complete -# main options -set wait_key = no +# }}} +# Basic Options {{{ + +source ~/.vim/bundle/badwolf/contrib/badwolf.muttrc # colorscheme +source ~/.mutt/sidebar.muttrc # sidebar + +set wait_key = no # shut up, mutt set mbox_type = Maildir # mailbox type set folder = ~/.mail # mailbox location set timeout = 3 # idle time before scanning set mail_check = 0 # minimum time between scans -set sort_alias = alias # sort alias file by alias -set reverse_alias # show names from alias file in index unset move # gmail does that set delete # don't ask, just do unset confirmappend # don't ask, just do! @@ -33,44 +41,44 @@ set beep_new # bell on new mails set pipe_decode # strip headers and eval mimes when piping set thorough_search # strip headers and eval mimes before searching -set spoolfile = "+steve-stevelosh.com/INBOX" # GMail is default inbox + +# }}} +# Status Bar {{{ -# index options +set status_chars = " *%A" +set status_format = "───[ Folder: %f ]───[%r%m messages%?n? (%n new)?%?d? (%d to delete)?%?t? (%t tagged)? ]───%>─%?p?( %p postponed )?───" + +# }}} +# Index View Options {{{ + +set date_format = "%m/%d" +set index_format = "[%Z] %D %-20.20F %s" set sort = threads # like gmail set sort_aux = reverse-last-date-received # like gmail set uncollapse_jump # don't collapse on an unread message set sort_re # thread based on regex set reply_regexp = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*" -# pager options +# }}} +# Pager View Options {{{ + set pager_index_lines = 10 # number of index lines to show -set pager_context = 5 # number of context lines to show +set pager_context = 3 # number of context lines to show set pager_stop # don't go to next message automatically set menu_scroll # scroll in menus -set smart_wrap # don't split words set tilde # show tildes like in vim unset markers # no ugly plus signs set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+" - -auto_view text/html # view html automatically -alternative_order text/plain text/enriched text/html # but prefer non-html - -# alternate emails -alternates sjl@pculture.org still\.?life@gmail.com steve@ladyluckblues.com +alternative_order text/plain text/enriched text/html -# formats -set date_format = "%m/%d" -set index_format = "[%Z] %D %-20.20F %s" -set status_format = "-%r- %v ---[ Folder: %f, Msgs: %m%?n? New: %n?%?d? Del: %d?%?t? Tag: %t?%?l? %l? ]%?p?---- .: %p waiting to send :. ?--%>- (%P) ---" -set alias_format = "%4n %t %-20a %r" +# }}} +# Compose View Options {{{ -# composing mail set realname = "Steve Losh" # who am i? set envelope_from # which from? set sig_dashes # dashes before sig set edit_headers # show headers when composing set fast_reply # skip to compose when replying -set sendmail_wait = 0 # wait for sending to successfully finish, because email is important set askcc # ask for CC: set fcc_attach # save attachments with the body unset mime_forward # forward attachments as part of body @@ -82,66 +90,125 @@ set include # include message in replies set forward_quote # include message in forwards -# headers to show +# }}} +# Headers {{{ + ignore * # ignore all headers unignore from: to: cc: date: subject: # show only these hdr_order from: to: cc: date: subject: # and in this order -# boxes -mailboxes +steve-stevelosh.com/INBOX +steve-stevelosh.com/vim +steve-stevelosh.com/clojure +steve-stevelosh.com/python +steve-stevelosh.com/mercurial +steve-stevelosh.com/archive +steve-stevelosh.com/sent +steve-stevelosh.com/drafts +# }}} +# steve@stevelosh.com {{{ + +# Default inbox. +set spoolfile = "+steve-stevelosh.com/INBOX" + +# Alternate email addresses. +alternates sjl@pculture.org still\.?life@gmail.com steve@ladyluckblues.com steve@pculture.org + +# Mailboxes to show in the sidebar. +mailboxes +steve-stevelosh.com/INBOX \ + +steve-stevelosh.com/vim \ + +steve-stevelosh.com/clojure \ + +steve-stevelosh.com/python \ + +steve-stevelosh.com/mercurial \ + +steve-stevelosh.com/archive \ + +steve-stevelosh.com/sent \ + +steve-stevelosh.com/drafts \ -# always sourced -source ~/.vim/bundle/badwolf/contrib/badwolf.muttrc # colorscheme -source ~/.mutt/steve-stevelosh.com.muttrc # stevelosh.com account detail -source ~/.mutt/sidebar.muttrc # sidebar +# Other special folders. +set mbox = "+steve-stevelosh.com/archive" +set postponed = "+steve-stevelosh.com/drafts" + +# Sending email. +set from = "steve@stevelosh.com" +set sendmail = "/usr/local/bin/msmtp -a stevelosh" +set sendmail_wait = 0 # no please don't silently fail, email is important +unset record -# account specific sources -folder-hook steve-stevelosh.com/* source ~/.mutt/steve-stevelosh.com.muttrc +# }}} +# Account Hooks {{{ + +# folder-hook steve-stevelosh.com/* source ~/.mutt/steve-stevelosh.com.muttrc -# unbind problematic keys +# }}} +# Key Bindings {{{ + +# Unbind Stupid Keys {{{ + bind index,pager \# noop bind index i noop bind index w noop -# basic bindings -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 index,pager R group-reply +# }}} +# 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" "call urlview to open links" +macro pager s "cat > ~/Desktop/" "save message as" + +# }}} +# Index {{{ + +bind index R group-reply bind index sync-mailbox bind index k previous-entry bind index j next-entry bind index gg first-entry bind index G last-entry -bind index \Cp recall-message +bind index p recall-message bind index collapse-thread +macro index s "cat > ~/Desktop/" "save message as" + +# Mark all as read +macro index \Cr "T~UN." "mark all messages as read" + +# Quickly change date formats +macro index f ":set date_format = \"%m/%d\"" "short date format" +macro index F ":set date_format = \"%m/%d at %I:%M %P\"" "long date format" # Sync email macro index O "offlineimap -q" "run offlineimap to sync mail in the foreground" macro index o "offlineimap -q >/dev/null 2>&1 &" "run offlineimap to sync mail in the background" -# Searching bodies -macro index B "~b " "search message bodies" - -# Opening links in mail -macro pager \Cu "|urlview" "call urlview to open links" - -# Mark all as read -macro index \Cr "T~UN." "mark all messages as read" +# Saner copy/move dialogs +macro index C "?" "copy a message to a mailbox" +macro index M "?" "move a message to a mailbox" -# Open message in MacVim -macro index,pager M "|mvim -c 'setlocal ft=mail' -c 'setlocal buftype=nofile' - >/dev/null" "open in macvim" - -# quickly change date formats -macro index f ":set date_format = \"%m/%d\"" "short date format" -macro index F ":set date_format = \"%m/%d at %I:%M %P\"" "long date format" - -# quickly change mailboxes +# Quickly change mailboxes macro index \' "+steve-stevelosh.com/INBOX" "go to stevelosh/INBOX" macro index \" "+steve-stevelosh.com/archive" "go to stevelosh/archive" -# save a decoded copy in ~ -macro index,pager P "cat > ~/Desktop/" "save message as" +# Just use notmuch for everything +macro index / "unset wait_keyread -p 'notmuch query: ' x; echo \$x >~/.cache/mutt_terms~i \"\`notmuch search --output=messages \$(cat ~/.cache/mutt_terms) | head -n 600 | tr '+' '.' | perl -le '@a=<>;chomp@a;s/\^id:// for@a;$,=\"|\";print@a'\`\"" "show only messages matching a notmuch pattern" + +# Unlimit aka show [a]ll +macro index a "all\n" "show all messages (undo limit)" + +# }}} +# Compose {{{ + +bind compose p postpone-message + +# }}} +# Attachment {{{ + +# View, god dammit! +bind attach view-mailcap + +# }}} +# "Open in Vim" {{{ + +macro index,pager V "|vim -c 'setlocal ft=mail' -c 'setlocal buftype=nofile' -" "open in vim" +macro index,pager M "|mvim -c 'setlocal ft=mail' -c 'setlocal buftype=nofile' - >/dev/null" "open in macvim" + +# }}} + +# }}} diff -r b5786e25b18d -r 553d109e7c61 mutt/steve-stevelosh.com.muttrc --- a/mutt/steve-stevelosh.com.muttrc Sun Jul 22 16:02:59 2012 -0400 +++ b/mutt/steve-stevelosh.com.muttrc Sun Jul 22 16:03:13 2012 -0400 @@ -1,11 +0,0 @@ -set from = "steve@stevelosh.com" -set sendmail = "/usr/local/bin/msmtp -a stevelosh" -set mbox = "+steve-stevelosh.com/archive" -unset record -set postponed = "+steve-stevelosh.com/drafts" - -macro index E "+steve-stevelosh.com/archive~B " "search everything" -macro index A "+steve-stevelosh.com/archive" "move message to the archive" -macro index D "+steve-stevelosh.com/trash" "move message to the trash" -macro index S "+steve-stevelosh.com/spam" "mark message as spam" - diff -r b5786e25b18d -r 553d109e7c61 offlineimaprc --- a/offlineimaprc Sun Jul 22 16:02:59 2012 -0400 +++ b/offlineimaprc Sun Jul 22 16:03:13 2012 -0400 @@ -8,6 +8,7 @@ localrepository = SteveLosh-Local remoterepository = SteveLosh-Remote status_backend = sqlite +postsynchook = notmuch new [Repository SteveLosh-Local] type = Maildir diff -r b5786e25b18d -r 553d109e7c61 pentadactylrc --- a/pentadactylrc Sun Jul 22 16:02:59 2012 -0400 +++ b/pentadactylrc Sun Jul 22 16:03:13 2012 -0400 @@ -16,47 +16,45 @@ set showtabline=multitab set showstatuslinks=command -set mapleader=',' - " FASTER PLEASE -nnoremap j 3j -nnoremap k 3k +nmap -builtin j 3j +nmap -builtin k 3k " Go to the second input field. " Useful for skipping over search fields, etc. -nnoremap gI 2gi +nmap -builtin gI 2gi " I never use marks, but always use quickmarks. -nnoremap "'" go -nnoremap '"' gn +nmap -builtin "'" go +nmap -builtin '"' gn " Switch tabs with parens -nnoremap ) :tn -nnoremap ( :tp +nmap -builtin ) :tn +nmap -builtin ( :tp " Finally I can overwrite the stupid fucking Firebug toggling correctly. -" nnoremap -" nnoremap +" nmap -builtin +" nmap -builtin " Console toggle -nnoremap -inoremap +nmap -builtin +imap -builtin " Inspect element toggle -nnoremap -inoremap +nmap -builtin +imap -builtin " Shift is hard. -nnoremap ; : +nmap -builtin ; : " YES YES YES REMOVE THE IDIOCY -nnoremap +nmap -builtin " Highlight all search matches, not just the first. set hlfind " Clear search highlighting and normal highlighting. -nnoremap :noh +nmap -builtin , :noh " Shut up. javascript dactyl.beep = function() { return false; } diff -r b5786e25b18d -r 553d109e7c61 vim/custom-dictionary.utf-8.add --- a/vim/custom-dictionary.utf-8.add Sun Jul 22 16:02:59 2012 -0400 +++ b/vim/custom-dictionary.utf-8.add Sun Jul 22 16:03:13 2012 -0400 @@ -56,3 +56,15 @@ refactored refactorings UUID +frontend +app +metadata +dict +JSON +TODO +bikeshedding +VM +Vagrantfile +dev +repo +hardcoded diff -r b5786e25b18d -r 553d109e7c61 vim/vimrc --- a/vim/vimrc Sun Jul 22 16:02:59 2012 -0400 +++ b/vim/vimrc Sun Jul 22 16:03:13 2012 -0400 @@ -302,6 +302,10 @@ nnoremap Q gqip vnoremap Q gq +" Reformat line. +" I never use l as a macro register anyway. +nnoremap ql ^vg_gq + " Easier linewise reselection nnoremap V V`] @@ -838,6 +842,17 @@ augroup END " }}} +" Mutt {{{ + +augroup ft_muttrc + au! + + au BufRead,BufNewFile *.muttrc set ft=muttrc + + au FileType muttrc setlocal foldmethod=marker foldmarker={{{,}}} +augroup END + +" }}} " Nginx {{{ augroup ft_nginx @@ -1125,7 +1140,7 @@ au! au Filetype nerdtree setlocal nolist - au Filetype nerdtree nnoremap K :q + " au Filetype nerdtree nnoremap K :q augroup END let NERDTreeHighlightCursorline = 1 @@ -1135,6 +1150,9 @@ let NERDTreeMinimalUI = 1 let NERDTreeDirArrows = 1 +let NERDChristmasTree = 1 +let NERDTreeChDirMode = 2 +let NERDTreeMapJumpFirstChild = 'gK' " }}} " OrgMode {{{