# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1391185782 18000
# Node ID e835f9dfe1dde43575d1bddbbd8d53513b144267
# Parent  736aa6c737d4f4183c6b437dd1bb72f18403fc7c
more shit

diff -r 736aa6c737d4 -r e835f9dfe1dd vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Tue Jan 28 11:50:20 2014 -0500
+++ b/vim/custom-dictionary.utf-8.add	Fri Jan 31 11:29:42 2014 -0500
@@ -124,7 +124,6 @@
 C2C
 ACH
 TBBK
-Arroway
 recon
 SFTP
 timestamp
@@ -146,3 +145,7 @@
 tarball
 S3
 spinup
+Onboarding
+onboard
+onboarding
+spellchecking
diff -r 736aa6c737d4 -r e835f9dfe1dd vim/vimrc
--- a/vim/vimrc	Tue Jan 28 11:50:20 2014 -0500
+++ b/vim/vimrc	Fri Jan 31 11:29:42 2014 -0500
@@ -62,12 +62,29 @@
 set shiftround
 set title
 set linebreak
-set dictionary=/usr/share/dict/words
-set spellfile=~/.vim/custom-dictionary.utf-8.add
 set colorcolumn=+1
 
-" iTerm2 is currently slow as ball at rendering the nice unicode lines, so for
-" now I'll just use ascii pipes.  They're ugly but at least I won't want to kill
+" Spelling
+"
+" There are three dictionaries I use for spellchecking:
+"
+"   /usr/share/dict/words
+"   Basic stuff.
+"
+"   ~/.vim/custom-dictionary.utf-8.add
+"   Custom words (like my name).  This is in my (version-controlled) dotfiles.
+"
+"   ~/.vim-local-dictionary.utf-8.add
+"   More custom words.  This is *not* version controlled, so I can stick
+"   work stuff in here without leaking internal names and shit.
+"
+" I also remap zG to add to the local dict (vanilla zG is useless anyway).
+set dictionary=/usr/share/dict/words
+set spellfile=~/.vim/custom-dictionary.utf-8.add,~/.vim-local-dictionary.utf-8.add
+nnoremap zG 2zg
+
+" iTerm2 is currently slow as balls at rendering the nice unicode lines, so for
+" now I'll just use ASCII pipes.  They're ugly but at least I won't want to kill
 " myself when trying to move around a file.
 set fillchars=diff:⣿,vert:│
 set fillchars=diff:⣿,vert:\|
@@ -305,7 +322,7 @@
                         \ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
 
 " Clean trailing whitespace
-nnoremap <leader>w mz:%s/\s\+$//<cr>:let @/=''<cr>`z
+nnoremap <leader>ww mz:%s/\s\+$//<cr>:let @/=''<cr>`z
 
 " Send visual selection to paste.stevelosh.com
 vnoremap <c-p> :w !curl -sF 'sprunge=<-' 'http://paste.stevelosh.com' \| tr -d '\n ' \| pbcopy && open `pbpaste`<cr>
@@ -437,17 +454,6 @@
 " This should preserve your last yank/delete as well.
 nnoremap zl :let @z=@"<cr>x$p:let @"=@z<cr>
 
-" Easy filetype switching {{{
-
-nnoremap _md :set ft=markdown<CR>
-nnoremap _hd :set ft=htmldjango<CR>
-nnoremap _jt :set ft=htmljinja<CR>
-nnoremap _js :set ft=javascript<CR>
-nnoremap _cw :set ft=confluencewiki<CR>
-nnoremap _pd :set ft=python.django<CR>
-nnoremap _d  :set ft=diff<CR>
-
-" }}}
 " Insert Mode Completion {{{
 
 inoremap <c-f> <c-x><c-f>
@@ -527,7 +533,6 @@
 endfunction
 nnoremap <c-]> :silent! call JumpToTag()<cr>
 nnoremap <c-\> :silent! call JumpToTagInSplit()<cr>
-" nnoremap <c-\> <c-w>v<c-]>mzzMzvzz15<c-e>`z:Pulse<cr>
 
 " Keep search matches in the middle of the window.
 nnoremap n nzzzv
@@ -853,6 +858,15 @@
 augroup END
 
 " }}}
+" DTrace {{{
+
+augroup ft_dtrace
+    au!
+
+    autocmd BufNewFile,BufRead *.d set filetype=dtrace
+augroup END
+
+" }}}
 " Firefox {{{
 
 augroup ft_firefox
diff -r 736aa6c737d4 -r e835f9dfe1dd weechat/weechat.conf
--- a/weechat/weechat.conf	Tue Jan 28 11:50:20 2014 -0500
+++ b/weechat/weechat.conf	Fri Jan 31 11:29:42 2014 -0500
@@ -35,7 +35,7 @@
 day_change_time_format = "%a, %d %b %Y"
 eat_newline_glitch = off
 highlight = "sjl,slosh,slj,clojerks,c2c,arroway,ingester"
-highlight_regex = "(^all[,:]|backend(ia)?[^/]|red[- ]tape|[mM]oney ?[dD]rop)"
+highlight_regex = "(^all[,:]|backend(ia)?[^s/]|red[- ]tape|[mM]oney ?[dD]rop|steve ?losh|rob ford)"
 highlight_tags = ""
 hotlist_add_buffer_if_away = on
 hotlist_buffer_separator = ", "