# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1581289754 18000
# Node ID 61707f342104bbf670cf69f89bf7ec1f887a86a3
# Parent  e746b3563ba721ab532d34ca9764672f42770360# Parent  dccf3005b8fee7d75e51f17ddfa6cc85476f0974
Merge.

diff -r dccf3005b8fe -r 61707f342104 .hgsubstate
--- a/.hgsubstate	Thu Feb 06 10:56:30 2020 -0500
+++ b/.hgsubstate	Sun Feb 09 18:09:14 2020 -0500
@@ -2,7 +2,7 @@
 1fc4a9fbead7e0acc4c828b346f3be2658ec3df9 mercurial/templates
 b6a8b49e2173ba5a1b34d00e68e0ed8addac3ebd vim/bundle/abolish
 a16a9b63eb85cc0960a7f25c54647ac1f99f3360 vim/bundle/ack
-7e97c2baea5edfb8b374677570df085108066590 vim/bundle/badwolf
+b428902745c5978fe6a78ef11db76692905a4873 vim/bundle/badwolf
 24f6d94dd03ba0fdc703265fe281f70cf2b45ba6 vim/bundle/boxdraw
 b542a7bc4d9bc5da8fb12e110fe7975131fb57a4 vim/bundle/clam
 8295187ea1210138c0b171d8e3ec3569936f4c1a vim/bundle/commentary
diff -r dccf3005b8fe -r 61707f342104 bin/backup-local
--- a/bin/backup-local	Thu Feb 06 10:56:30 2020 -0500
+++ b/bin/backup-local	Sun Feb 09 18:09:14 2020 -0500
@@ -4,7 +4,7 @@
 
 ban -F metal "NAS"
 
-restic --repo /mnt/cryo/restic-ouroboros/repo \
+restic --repo /cryo/restic-ouroboros/repo \
        --exclude-file=/home/sjl/src/dotfiles/restic/excludes.txt \
        --password-file /home/sjl/.restic-password-local \
        backup /home/sjl
diff -r dccf3005b8fe -r 61707f342104 bin/ee
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/ee	Sun Feb 09 18:09:14 2020 -0500
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+e .
diff -r dccf3005b8fe -r 61707f342104 bin/rl
--- a/bin/rl	Thu Feb 06 10:56:30 2020 -0500
+++ b/bin/rl	Sun Feb 09 18:09:14 2020 -0500
@@ -2,6 +2,6 @@
 
 set -euo pipefail
 
-restic --repo /mnt/cryo/restic-ouroboros/repo \
+restic --repo /cryo/restic-ouroboros/repo \
        --password-file /home/sjl/.restic-password-local \
        "$@"
diff -r dccf3005b8fe -r 61707f342104 fish/config.fish
--- a/fish/config.fish	Thu Feb 06 10:56:30 2020 -0500
+++ b/fish/config.fish	Sun Feb 09 18:09:14 2020 -0500
@@ -136,6 +136,11 @@
 set -g -x GOPATH "$HOME/.go"
 
 # }}}
+# R {{{
+
+set -g -x R_LIBS_USER "$HOME/.R"
+
+# }}}
 # Z {{{
 
 if test -e ~/src/z-fish/z.fish
diff -r dccf3005b8fe -r 61707f342104 gnuplot
--- a/gnuplot	Thu Feb 06 10:56:30 2020 -0500
+++ b/gnuplot	Sun Feb 09 18:09:14 2020 -0500
@@ -5,6 +5,37 @@
 set samples 1000
 
 # }}}
+# Styles ------------------------------------------------------------------ {{{
+
+set grid
+
+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'
+
+unset linetype 11
+unset linetype 12
+unset linetype 13
+unset linetype 14
+unset linetype 15
+unset linetype 16
+unset linetype 17
+unset linetype 18
+unset linetype 19
+unset linetype 20
+
+set linetype cycle 10
+
+# }}}
 # Constants --------------------------------------------------------------- {{{
 
 tau = 2 * pi