moar

sjl · May 19, 2012 · 3049063 · 3049063
1 parent 9e69ea4
commit 3049063
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/dotcss/unisubs.sifterapp.com.css b/dotcss/unisubs.sifterapp.com.css
@@ -1,5 +1,5 @@
-tr.group td {
+table.grouped tr.group td {
-    padding: 6px 0px 4px 5px !important;
+    padding: 6px 0px 4px 7px !important;
 }
 tr.issue td {
     padding: 8px 8px 6px 0px !important;

diff --git a/gitconfig b/gitconfig
@@ -73,7 +73,7 @@
     tool = splice
 
 [mergetool "splice"]
-    cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
+    cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
     trustExitCode = true
 [web]
     browser = open
diff --git a/mutt/muttrc b/mutt/muttrc
@@ -119,7 +119,8 @@ bind index \Cp      recall-message
 bind index <space>  collapse-thread
 
 # Sync email
-macro index O "<shell-escape>offlineimap -q<enter>" "run offlineimap to sync mail"
+macro index O "<shell-escape>offlineimap -q<enter>"                   "run offlineimap to sync mail in the foreground"
+macro index o "<shell-escape>offlineimap -q >/dev/null 2>&1 &<enter>" "run offlineimap to sync mail in the background"
 
 # Searching bodies
 macro index B "<limit>~b " "search message bodies"
@@ -131,7 +132,7 @@ macro pager \Cu "|urlview<enter>" "call urlview to open links"
 macro index \Cr "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
 
 # Open message in MacVim
-macro index,pager o "|mvim -c 'setlocal ft=mail' -c 'setlocal buftype=nofile' -<enter>"  "open in macvim"
+macro index,pager M "|mvim -c 'setlocal ft=mail' -c 'setlocal buftype=nofile' - >/dev/null<enter>"  "open in macvim"
 
 # quickly change date formats
 macro index <esc>f ":set date_format = \"%m/%d\"<enter>"             "short date format"

diff --git a/vim/vimrc b/vim/vimrc
@@ -787,6 +787,15 @@ augroup ft_markdown
     au Filetype markdown nnoremap <buffer> <localleader>3 I### <ESC>
 augroup END
 
+" }}}
+" Mercurial {{{
+
+augroup ft_mercurial
+    au!
+
+    au BufNewFile,BufRead *hg-editor-*.txt setlocal filetype=hgcommit
+augroup END
+
 " }}}
 " Nginx {{{
 

diff --git a/zsh/misc.zsh b/zsh/misc.zsh
@@ -19,7 +19,7 @@ alias spotlight-wat='sudo fs_usage -w -f filesys mdworker | grep "open"'
 alias mutt='cd ~/Desktop; mutt'
 alias hi='pygmentize'
 
-function gimmeurjson() { curl "$*" | python -mjson.tool | pygmentize -l javascript; }
+function cj() { curl "$*" | python -mjson.tool | pygmentize -l javascript; }
 
 function mdown () {
     (echo '