# HG changeset patch # User Steve Losh # Date 1332342235 14400 # Node ID de63c68eb82c496c81e23e5da54876a8e0a4517d # Parent bdcdc5452cc37e1f79111c3f22a3eb8f866327c7 More. diff -r bdcdc5452cc3 -r de63c68eb82c .ackrc --- a/.ackrc Thu Mar 08 10:38:41 2012 -0500 +++ b/.ackrc Wed Mar 21 11:03:55 2012 -0400 @@ -8,9 +8,15 @@ --type-set vim=.vim --type-set +puppet=.pp +--type-set fe=.html,.js,.less --type-set fea=.html,.js,.less,.css +--type-set +docs=.markdown,.md,.mdown,.rst --ignore-dir=public/media/cache --ignore-dir=public/static/cache +--ignore-dir=build/html +--ignore-dir=docs/build --ignore-dir=migrations diff -r bdcdc5452cc3 -r de63c68eb82c .hgsubstate --- a/.hgsubstate Thu Mar 08 10:38:41 2012 -0500 +++ b/.hgsubstate Wed Mar 21 11:03:55 2012 -0400 @@ -2,11 +2,11 @@ 4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim a41d5d52c39a31128e969e69acf800b198cb07f9 vim/bundle/ack -6073c4e56185776c0fc6a363612d729c6975404c vim/bundle/badwolf +7d5b26907ce4e4d6de7ddf033fee82930733718c vim/bundle/badwolf 93cb20dbfbab723e1557801469ae70f4f46499da vim/bundle/ctrlp 667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion -03e138c3496926b193402f4e1542f0a99924f999 vim/bundle/fugitive -a860f15c7226ee5b352303c5032732a423409932 vim/bundle/gundo +22c8ffa2ba3ce30364fef382a7c505826a5c5761 vim/bundle/fugitive +8078f3e3ed0f8a954d83ab35f238881e9fce479a vim/bundle/gundo 4ef2d418f48d30fed2f7ce00f598d6871a0010fe vim/bundle/html5 78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e vim/bundle/indent-object 75ab8c11b56aae8e35f211d96fb008efb1ab946a vim/bundle/linediff @@ -16,7 +16,7 @@ d6da78f985e99d8388cd55db2587b19abc0628c2 vim/bundle/powerline d27022dc0bf2302cf31015d1ca0a2f80d55f3596 vim/bundle/python-mode fa3563dda862c1dc46ddac32d8a9f939e9077379 vim/bundle/rainbow-parentheses -9bbaa62571c2324160c8b901bf2cadfd69f7afce vim/bundle/slimv +f4c1752e7421ffbcb37a65a6e925a4b96d0d696f vim/bundle/slimv c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup 6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit b8a34a485dfdda1f88a2290c8e4b611556cc2fc4 vim/bundle/supertab diff -r bdcdc5452cc3 -r de63c68eb82c .offlineimaprc --- a/.offlineimaprc Thu Mar 08 10:38:41 2012 -0500 +++ b/.offlineimaprc Wed Mar 21 11:03:55 2012 -0400 @@ -16,5 +16,15 @@ remoteuser = steve@stevelosh.com remotepasseval = get_keychain_pass(account="steve@stevelosh.com", server="imap.gmail.com") realdelete = no -nametrans = lambda folder: re.sub('.*Spam$', 'spam', 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: re.sub('.*Drafts$', 'drafts', + re.sub('.*Sent Mail$', 'sent', + re.sub('.*Starred$', 'flagged', + re.sub('.*Trash$', 'trash', + re.sub('.*All Mail$', 'archive', + folder))))) +folderfilter = lambda folder: folder not in ['[Gmail]/Trash', + 'Nagios', + 'Flask', + '[Gmail]/Important', + '[Gmail]/Spam', + ] diff -r bdcdc5452cc3 -r de63c68eb82c bin/sprunge --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bin/sprunge Wed Mar 21 11:03:55 2012 -0400 @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +curl -F 'sprunge=<-' http://sprunge.us | pbcopy diff -r bdcdc5452cc3 -r de63c68eb82c mutt/muttrc --- a/mutt/muttrc Thu Mar 08 10:38:41 2012 -0500 +++ b/mutt/muttrc Wed Mar 21 11:03:55 2012 -0400 @@ -87,7 +87,7 @@ # always sourced #source $alias_file # required for functionality -source ~/.mutt/colors.muttrc # source colors file +source ~/.vim/bundle/badwolf/contrib/badwolf.muttrc # source colors file source ~/.mutt/steve-stevelosh.com.muttrc # source gmail as default source ~/.mutt/sidebar.muttrc # any muttng options are here @@ -127,7 +127,8 @@ macro index F ":set date_format = \"%m/%d at %I:%M %P\"" "long date format" # mailbox -macro index \' "+steve-stevelosh.com/INBOX" "go to stevelosh/INBOX" +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" diff -r bdcdc5452cc3 -r de63c68eb82c mutt/sidebar.muttrc --- a/mutt/sidebar.muttrc Thu Mar 08 10:38:41 2012 -0500 +++ b/mutt/sidebar.muttrc Wed Mar 21 11:03:55 2012 -0400 @@ -5,10 +5,10 @@ # settings set sidebar_delim = ' │' set sidebar_visible = yes -set sidebar_width = 20 +set sidebar_width = 24 # colors -color sidebar_new color117 color233 +color sidebar_new color221 color233 # bindings bind index,pager sidebar-next diff -r bdcdc5452cc3 -r de63c68eb82c vim/.vimrc --- a/vim/.vimrc Thu Mar 08 10:38:41 2012 -0500 +++ b/vim/.vimrc Wed Mar 21 11:03:55 2012 -0400 @@ -384,6 +384,9 @@ au BufNewFile,BufRead *.cljs set filetype=clojurescript au FileType clojurescript call TurnOnClojureFolding() + + " Indent top-level form. + au FileType clojurescript nmap = v((((((((((((=% augroup END " }}} @@ -524,7 +527,7 @@ au FileType jinja,htmldjango inoremap {%%} " Django variables - au FileType jinja,htmldjango inoremap {{}} + au FileType jinja,htmldjango inoremap {{}} augroup END " }}} @@ -702,15 +705,26 @@ noremap :set invfullscreen inoremap :set invfullscreena -" Fuck you too, manual key. -nnoremap K - " Stop it, hash key. inoremap # X# " Kill window nnoremap K :q +" Redraw +nnoremap rr :redraw! + +" System clipboard interaction +" From https://github.com/henrik/dotfiles/blob/master/vim/config/mappings.vim +noremap y "*y +noremap p :set paste"*p:set nopaste +noremap P :set paste"*P:set nopaste + +" I constantly hit "u" in visual mode when I mean to "y". Use "gu" for those rare occasions. +" From https://github.com/henrik/dotfiles/blob/master/vim/config/mappings.vim +vnoremap u +vnoremap gu u + " For some reason ctags refuses to ignore Python variables, so I'll just hack " the tags file with sed and strip them out myself. " @@ -727,8 +741,11 @@ " Send visual selection to gist.github.com as a private, filetyped Gist " Requires the gist command line too (brew install gist) -vnoremap G :w !gist -p -t %:e \| pbcopy -vnoremap UG :w !gist -p \| pbcopy +" vnoremap G :w !gist -p -t %:e \| pbcopy +" vnoremap UG :w !gist -p \| pbcopy + +" Send visual selection to sprunge.us +vnoremap G :w !curl -sF 'sprunge=<-' 'http://sprunge.us' \| pbcopy " Change case nnoremap U gUiw @@ -748,6 +765,9 @@ " Easier linewise reselection nnoremap V V`] +" Keep the cursor in place while joining limes +nnoremap J mzJ`z + " 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 imwgk:silent! s/\v +$//:noh`w @@ -763,8 +783,8 @@ nnoremap 2 :set cmdheight=2 " Source -vnoremap S y:execute @@ -nnoremap S ^vg_y:execute @@ +vnoremap S y:execute @@:echo 'Sourced selection.' +nnoremap S ^vg_y:execute @@:echo 'Sourced line.' " Marks and Quotes noremap ' ` @@ -857,6 +877,11 @@ nmap x ToggleAutoCloseMappings " }}} +" Bad Wolf {{{ + +let g:badwolf_html_link_underline = 0 + +" }}} " Commentary {{{ nmap c CommentaryLine @@ -865,6 +890,7 @@ augroup plugin_commentary au! au FileType htmldjango setlocal commentstring={#\ %s\ #} + au FileType clojurescript setlocal commentstring=;\ %s augroup END " }}} @@ -1131,7 +1157,8 @@ " Syntastic {{{ let g:syntastic_enable_signs = 1 -let g:syntastic_disabled_filetypes = ['html'] +let g:syntastic_check_on_open = 1 +let g:syntastic_disabled_filetypes = ['html', 'rst'] let g:syntastic_stl_format = '[%E{%e Errors}%B{, }%W{%w Warnings}]' let g:syntastic_jsl_conf = '$HOME/.vim/jsl.conf' diff -r bdcdc5452cc3 -r de63c68eb82c vim/ftplugin/clojure/clojurefolding.vim --- a/vim/ftplugin/clojure/clojurefolding.vim Thu Mar 08 10:38:41 2012 -0500 +++ b/vim/ftplugin/clojure/clojurefolding.vim Wed Mar 21 11:03:55 2012 -0400 @@ -17,7 +17,16 @@ \ 'defmulti', \ 'defonce', \ 'defpage', + \ 'defmigration', + \ 'defremote', \ 'defpartial', + \ 'extend-type', + \ 'extend-protocol', + \ 'defgauge', + \ 'defmeter', + \ 'defhistogram', + \ 'defcounter', + \ 'deftimer', \ 'deftest', \ 'defroutes', \ 'defentity',