# HG changeset patch # User Steve Losh # Date 1310738661 14400 # Node ID dbda09a7516048ae5769e3d951e7487d162ce5f3 # Parent a6d28812229724038bb899cc3595bd9b93cda024 Moar. diff -r a6d288122297 -r dbda09a75160 .hgrc --- a/.hgrc Wed Jul 13 16:50:22 2011 -0400 +++ b/.hgrc Fri Jul 15 10:04:21 2011 -0400 @@ -117,6 +117,7 @@ cus = commit -m 'Update subrepository state.' cuf = commit -m 'Update fixtures.' -I '**fixtures**.json' cmm = commit -m 'Merge.' +cws = commit -m 'Whitespace.' mergelocal = !$HG --config ui.merge=internal:local merge $@ mergeother = !$HG --config ui.merge=internal:other merge $@ diff -r a6d288122297 -r dbda09a75160 dotjs/google.com.js --- a/dotjs/google.com.js Wed Jul 13 16:50:22 2011 -0400 +++ b/dotjs/google.com.js Fri Jul 15 10:04:21 2011 -0400 @@ -1,5 +1,5 @@ $(function() { - var css = ".vspib, .vspi {display: none;} #vspb {display: none;}"; + var css = ".vspib, .vspb, .vspi {display: none;} #vspb {display: none;}"; if (typeof GM_addStyle != "undefined") { GM_addStyle(css); } else if (typeof PRO_addStyle != "undefined") { diff -r a6d288122297 -r dbda09a75160 vim/.vimrc --- a/vim/.vimrc Wed Jul 13 16:50:22 2011 -0400 +++ b/vim/.vimrc Fri Jul 15 10:04:21 2011 -0400 @@ -449,6 +449,9 @@ nnoremap ev sjL:e $MYVIMRC nnoremap es sjL:e ~/.vim/snippets/ nnoremap eo sjL:e ~/Dropbox/Org4j +nnoremap eh sjL:e ~/.hgrc +nnoremap em sjL:e ~/.mutt/muttrc +nnoremap ez sjL:e ~/lib/dotfiles/zsh4j " }}} " Convenience mappings -------------------------------------------------------- {{{ @@ -512,6 +515,7 @@ nnoremap T :!ctags -R -f ./tags . " Easy filetype switching +nnoremap _md :set ft=markdown nnoremap _hd :set ft=htmldjango nnoremap _jt :set ft=htmljinja nnoremap _cw :set ft=confluencewiki diff -r a6d288122297 -r dbda09a75160 zsh/misc.zsh --- a/zsh/misc.zsh Wed Jul 13 16:50:22 2011 -0400 +++ b/zsh/misc.zsh Fri Jul 15 10:04:21 2011 -0400 @@ -77,3 +77,7 @@ alias dvt='dtach -A /tmp/dvtm-session.sock -r winch dvtm -m "^f"' alias goawayswapfilesyouareswapfilesidontevenneedyou='rm ~/.vim/tmp/swap/*' + +function fack () { + find . $@ | grep -v '/\.hg\|/\.git' +}