# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1581567041 18000
# Node ID 73580329f5bf20a9b878ed2b98518dc9e11c0e1f
# Parent  a20cd97bae84ba139c54bf07926bf7fcba049112# Parent  a6e1eedddb2017d9c544ea81ea3a46c964e05867
Merge.

diff -r a6e1eedddb20 -r 73580329f5bf gnuplot
--- a/gnuplot	Wed Feb 12 11:50:57 2020 -0500
+++ b/gnuplot	Wed Feb 12 23:10:41 2020 -0500
@@ -11,16 +11,16 @@
 
 set palette defined (0 '#fef0d9', 1 '#fdcc8a', 2 '#fc8d59', 3 '#d7301f')
 
-set linetype  1 linewidth 2 pointtype 7 ps 1.0 linecolor rgb '#1f78b4'
-set linetype  2 linewidth 2 pointtype 5 ps 1.0 linecolor rgb '#33a02c'
-set linetype  3 linewidth 2 pointtype 9 ps 1.4 linecolor rgb '#e31a1c'
-set linetype  4 linewidth 2 pointtype 7 ps 1.0 linecolor rgb '#ff7f00'
-set linetype  5 linewidth 2 pointtype 5 ps 1.0 linecolor rgb '#6a3d9a'
-set linetype  6 linewidth 2 pointtype 9 ps 1.4 linecolor rgb '#a6cee3'
-set linetype  7 linewidth 2 pointtype 7 ps 1.0 linecolor rgb '#b2df8a'
-set linetype  8 linewidth 2 pointtype 5 ps 1.0 linecolor rgb '#fb9a99'
-set linetype  9 linewidth 2 pointtype 9 ps 1.4 linecolor rgb '#fdbf6f'
-set linetype 10 linewidth 2 pointtype 7 ps 1.0 linecolor rgb '#cab2d6'
+set linetype  1 linewidth 1.5 pointtype 7 ps 1.0 linecolor rgb '#1f78b4'
+set linetype  2 linewidth 1.5 pointtype 5 ps 1.0 linecolor rgb '#33a02c'
+set linetype  3 linewidth 1.5 pointtype 9 ps 1.4 linecolor rgb '#e31a1c'
+set linetype  4 linewidth 1.5 pointtype 7 ps 1.0 linecolor rgb '#ff7f00'
+set linetype  5 linewidth 1.5 pointtype 5 ps 1.0 linecolor rgb '#6a3d9a'
+set linetype  6 linewidth 1.5 pointtype 9 ps 1.4 linecolor rgb '#a6cee3'
+set linetype  7 linewidth 1.5 pointtype 7 ps 1.0 linecolor rgb '#b2df8a'
+set linetype  8 linewidth 1.5 pointtype 5 ps 1.0 linecolor rgb '#fb9a99'
+set linetype  9 linewidth 1.5 pointtype 9 ps 1.4 linecolor rgb '#fdbf6f'
+set linetype 10 linewidth 1.5 pointtype 7 ps 1.0 linecolor rgb '#cab2d6'
 
 unset linetype 11
 unset linetype 12
diff -r a6e1eedddb20 -r 73580329f5bf vim/vimrc
--- a/vim/vimrc	Wed Feb 12 11:50:57 2020 -0500
+++ b/vim/vimrc	Wed Feb 12 23:10:41 2020 -0500
@@ -451,7 +451,7 @@
 command! -bang Wqa wqa<bang>
 
 " Unfuck my screen
-nnoremap U :syntax sync fromstart<cr>:redraw!<cr>
+nnoremap <leader>u :syntax sync fromstart<cr>:redraw!<cr>
 
 " Pushing
 nnoremap <leader>Go :Start! git push origin<cr>
@@ -491,6 +491,9 @@
 nnoremap ]Z ]Sz=
 nnoremap [Z [Sz=
 
+" Upcase
+nnoremap U gUiww
+
 " Insert Mode Completion {{{
 
 inoremap <c-f> <c-x><c-f>
@@ -1795,8 +1798,21 @@
     au FileType pgsql set softtabstop=2 shiftwidth=2
     au FileType pgsql setlocal commentstring=--\ %s comments=:--
 
-    " kill pager with q
-    au FileType pgsql nnoremap <buffer> <silent> <localleader>q :call SendToTmuxRaw("q")<cr>
+    " Set up some basic neorepl mappings.
+    "
+    " key  desc                   mnemonic
+    " \o - connect neorepl        [o]pen repl
+    " \l - send current line      [l]ine
+    " \e - send current hunk      [e]val
+    " \f - send entire file       [r]eload file
+    " \c - send ctrl-l            [c]lear
+
+    au FileType pgsql nnoremap <buffer> <silent> <localleader>o :call NeoReplOpenFish()<cr>
+    au FileType pgsql nnoremap <buffer> <silent> <localleader>l :call NeoReplSendCurrentLine()<cr>
+    au FileType pgsql nnoremap <buffer> <silent> <localleader>e :call NeoReplSendParagraph()<cr>
+    au FileType pgsql nnoremap <buffer> <silent> <localleader>f :call NeoReplSendEntireFile()<cr>
+    au FileType pgsql nnoremap <buffer> <silent> <localleader>c :call NeoReplSendRaw("")<cr>
+
 augroup END
 
 " }}}
@@ -2199,10 +2215,6 @@
 vnoremap <leader>H :Gbrowse<cr>
 nnoremap <leader>H V:Gbrowse<cr>
 
-" "(Upstream) Hub"
-vnoremap <leader>u :Gbrowse @upstream<cr>
-nnoremap <leader>u V:Gbrowse @upstream<cr>
-
 " }}}
 " Go {{{
 
@@ -2280,6 +2292,14 @@
     call SelectAndSendToNeoRepl("^vg_")
 endfunction "}}}
 
+function! NeoReplSendParagraph() "{{{
+    call SelectAndSendToNeoRepl("^Vap")
+endfunction "}}}
+
+function! NeoReplOpenFish() "{{{
+    NeoRepl fish
+endfunction "}}}
+
 " }}}
 " NERD Tree {{{