Permalink
Browse files

More.

  • Loading branch information...
1 parent 92006a1 commit abbd6fcebd124ec0c2978fed60965482f0c4b0d7 @sjl committed Mar 21, 2012
Showing with 75 additions and 19 deletions.
  1. +6 −0 .ackrc
  2. +4 −4 .hgsubstate
  3. +12 −2 .offlineimaprc
  4. +3 −0 bin/sprunge
  5. +3 −2 mutt/muttrc
  6. +2 −2 mutt/sidebar.muttrc
  7. +36 −9 vim/.vimrc
  8. +9 −0 vim/ftplugin/clojure/clojurefolding.vim
View
6 .ackrc
@@ -8,9 +8,15 @@ less=.less
--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
View
@@ -2,11 +2,11 @@ c711681883f3419b85494e3b285b988e8e2dcbca keymando/Plugins/abbrev
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 @@ b7889db57c90824ff5092da4fdde9e05689f24fa vim/bundle/nosecompiler
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
View
@@ -16,5 +16,15 @@ type = Gmail
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',
+ ]
View
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+curl -F 'sprunge=<-' http://sprunge.us | pbcopy
View
@@ -87,7 +87,7 @@ mailboxes +steve-stevelosh.com/INBOX +steve-stevelosh.com/vim +steve-stevelosh.c
# 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 <esc>f ":set date_format = \"%m/%d\"<enter>"
macro index <esc>F ":set date_format = \"%m/%d at %I:%M %P\"<enter>" "long date format"
# mailbox
-macro index \' "<change-folder>+steve-stevelosh.com/INBOX<enter>" "go to stevelosh/INBOX"
+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"
# save a decoded copy in ~
macro index,pager P "<pipe-message>cat > ~/Desktop/" "save message as"
View
@@ -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 <down> sidebar-next
View
@@ -384,6 +384,9 @@ augroup ft_clojurescript
au BufNewFile,BufRead *.cljs set filetype=clojurescript
au FileType clojurescript call TurnOnClojureFolding()
+
+ " Indent top-level form.
+ au FileType clojurescript nmap <buffer> <localleader>= v((((((((((((=%
augroup END
" }}}
@@ -524,7 +527,7 @@ augroup ft_html
au FileType jinja,htmldjango inoremap <buffer> <c-t> {%<space><space>%}<left><left><left>
" Django variables
- au FileType jinja,htmldjango inoremap <buffer> <c-k> {{<space><space>}}<left><left><left>
+ au FileType jinja,htmldjango inoremap <buffer> <c-f> {{<space><space>}}<left><left><left>
augroup END
" }}}
@@ -702,15 +705,26 @@ augroup END
noremap <F1> :set invfullscreen<CR>
inoremap <F1> <ESC>:set invfullscreen<CR>a
-" Fuck you too, manual key.
-nnoremap K <nop>
-
" Stop it, hash key.
inoremap # X<BS>#
" Kill window
nnoremap K :q<cr>
+" Redraw
+nnoremap <leader>rr :redraw!<cr>
+
+" System clipboard interaction
+" From https://github.com/henrik/dotfiles/blob/master/vim/config/mappings.vim
+noremap <leader>y "*y
+noremap <leader>p :set paste<CR>"*p<CR>:set nopaste<CR>
+noremap <leader>P :set paste<CR>"*P<CR>:set nopaste<CR>
+
+" 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 <nop>
+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 @@ nnoremap <leader>w :%s/\s\+$//<cr>:let @/=''<cr>
" Send visual selection to gist.github.com as a private, filetyped Gist
" Requires the gist command line too (brew install gist)
-vnoremap <leader>G :w !gist -p -t %:e \| pbcopy<cr>
-vnoremap <leader>UG :w !gist -p \| pbcopy<cr>
+" vnoremap <leader>G :w !gist -p -t %:e \| pbcopy<cr>
+" vnoremap <leader>UG :w !gist -p \| pbcopy<cr>
+
+" Send visual selection to sprunge.us
+vnoremap <leader>G :w !curl -sF 'sprunge=<-' 'http://sprunge.us' \| pbcopy<cr>
" Change case
nnoremap U gUiw
@@ -748,6 +765,9 @@ vnoremap Q gq
" Easier linewise reselection
nnoremap <leader>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 i<cr><esc><right>mwgk:silent! s/\v +$//<cr>:noh<cr>`w
@@ -763,8 +783,8 @@ nnoremap <leader>1 :set cmdheight=1<cr>
nnoremap <leader>2 :set cmdheight=2<cr>
" Source
-vnoremap <leader>S y:execute @@<cr>
-nnoremap <leader>S ^vg_y:execute @@<cr>
+vnoremap <leader>S y:execute @@<cr>:echo 'Sourced selection.'<cr>
+nnoremap <leader>S ^vg_y:execute @@<cr>:echo 'Sourced line.'<cr>
" Marks and Quotes
noremap ' `
@@ -857,6 +877,11 @@ nnoremap <leader>a :Ack!<space>
nmap <Leader>x <Plug>ToggleAutoCloseMappings
" }}}
+" Bad Wolf {{{
+
+let g:badwolf_html_link_underline = 0
+
+" }}}
" Commentary {{{
nmap <leader>c <Plug>CommentaryLine
@@ -865,6 +890,7 @@ xmap <leader>c <Plug>Commentary
augroup plugin_commentary
au!
au FileType htmldjango setlocal commentstring={#\ %s\ #}
+ au FileType clojurescript setlocal commentstring=;\ %s
augroup END
" }}}
@@ -1131,7 +1157,8 @@ let g:SuperTabLongestHighlight = 1
" 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'
@@ -17,7 +17,16 @@ let folded_forms = [
\ 'defmulti',
\ 'defonce',
\ 'defpage',
+ \ 'defmigration',
+ \ 'defremote',
\ 'defpartial',
+ \ 'extend-type',
+ \ 'extend-protocol',
+ \ 'defgauge',
+ \ 'defmeter',
+ \ 'defhistogram',
+ \ 'defcounter',
+ \ 'deftimer',
\ 'deftest',
\ 'defroutes',
\ 'defentity',

0 comments on commit abbd6fc

Please sign in to comment.