# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1393263027 18000
# Node ID 957e7c0065e9aec00d7bb9614334f8e670461698
# Parent  d6b09d11fdb8f2ee236e0007ca5114189a0f7dd4
mooooore shit

diff -r d6b09d11fdb8 -r 957e7c0065e9 fish/functions/pj.fish
--- a/fish/functions/pj.fish	Thu Feb 20 15:55:57 2014 -0500
+++ b/fish/functions/pj.fish	Mon Feb 24 12:30:27 2014 -0500
@@ -1,4 +1,9 @@
 function pj -d "Prettify JSON"
-    python -m json.tool | pygmentize -l json
+    if test "$argv[1]" = "-C"
+        # no color
+        python -m json.tool
+    else
+        python -m json.tool | pygmentize -l json
+    end
 end
 
diff -r d6b09d11fdb8 -r 957e7c0065e9 fish/functions/ppj.fish
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fish/functions/ppj.fish	Mon Feb 24 12:30:27 2014 -0500
@@ -0,0 +1,3 @@
+function ppj -d "Prettify Pasteboard JSON"
+    pbp | pj
+end
diff -r d6b09d11fdb8 -r 957e7c0065e9 vim/vimrc
--- a/vim/vimrc	Thu Feb 20 15:55:57 2014 -0500
+++ b/vim/vimrc	Mon Feb 24 12:30:27 2014 -0500
@@ -1112,9 +1112,15 @@
     au!
 
     au BufNewFile,BufRead *.sql set filetype=pgsql
+    au BufNewFile,BufRead *.pgsql set filetype=pgsql
+
     au FileType pgsql set foldmethod=indent
     au FileType pgsql set softtabstop=2 shiftwidth=2
     au FileType pgsql setlocal commentstring=--\ %s comments=:--
+
+    " Send to tmux with localleader e
+    au FileType pgsql nnoremap <buffer> <silent> <localleader>e :let psql_tslime_view = winsaveview()<cr>vip"ry:call SendToTmux(@r)<cr>:call winrestview(psql_tslime_view)<cr>
+
 augroup END
 
 " }}}