# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1594655531 14400
# Node ID 6f0af1e0b0c9720a77c104498bb3591d6bb0715e
# Parent  ccc0ace2e34306047a096ff9aaa86188ba6bccec# Parent  1d7d7c65d8930f352468e2c077fb73ac0e56a9a5
Merge.

diff -r ccc0ace2e343 -r 6f0af1e0b0c9 bin/code-to-pdf
--- a/bin/code-to-pdf	Mon Jul 13 11:51:28 2020 -0400
+++ b/bin/code-to-pdf	Mon Jul 13 11:52:11 2020 -0400
@@ -9,7 +9,7 @@
     --toc \
     --header '%H - $N | | page $% of $= in file $v' \
     --fancy-header=sjl \
-    --font "UbuntuMono-Regular@10" \
+    --font "UbuntuMono-Regular@9" \
     --header-font "UbuntuMono-Bold@12" \
     --title "$TITLE" \
     --baselineskip 3 \
diff -r ccc0ace2e343 -r 6f0af1e0b0c9 bin/k-dammit
--- a/bin/k-dammit	Mon Jul 13 11:51:28 2020 -0400
+++ b/bin/k-dammit	Mon Jul 13 11:52:11 2020 -0400
@@ -4,4 +4,5 @@
   inotifywait -q -e create --exclude '.*tmp.*' /dev/input
   sleep 0.25
   DISPLAY=:0.0 /home/sjl/src/dotfiles/bin/k
+  echo Updating keyboard settings at `date` >> ~/.keyboard-settings-update.log
 done
diff -r ccc0ace2e343 -r 6f0af1e0b0c9 browsrc
--- a/browsrc	Mon Jul 13 11:51:28 2020 -0400
+++ b/browsrc	Mon Jul 13 11:52:11 2020 -0400
@@ -1,1 +1,3 @@
 (brows:define-action #\newline "xdg-open" :exit t)
+(brows:define-action #\o "xdg-open" :exit nil)
+(brows:define-action #\w "w3m" :exit nil :tty t)
diff -r ccc0ace2e343 -r 6f0af1e0b0c9 gnuplot
--- a/gnuplot	Mon Jul 13 11:51:28 2020 -0400
+++ b/gnuplot	Mon Jul 13 11:52:11 2020 -0400
@@ -9,11 +9,12 @@
 
 set grid
 
-set pointintervalbox 1.25
+set pointintervalbox 1.3
 
 clr = "call '~/src/dotfiles/gnuplot-scripts/color.gp'"
 bwp = "call '~/src/dotfiles/gnuplot-scripts/black-and-white-points.gp'"
 bwl = "call '~/src/dotfiles/gnuplot-scripts/black-and-white-lines.gp'"
+bwlp = "call '~/src/dotfiles/gnuplot-scripts/black-and-white-lines-points.gp'"
 @clr
 
 # }}}
@@ -30,6 +31,25 @@
 max(a, b) = (a>b) ? a : b
 
 # }}}
+# Linear Regression Fitting Functions ------------------------------------- {{{
+
+baselrt(mm, bb, mprecision, bprecision) = sprintf(\
+        sprintf("%%.%dfx + %%.%df", mprecision, bprecision), \
+    mm, bb)
+
+lr(x) = m * x + b
+lrt(mp, bp) = baselrt(m, b, mp, bp)
+
+lr2(x) = m2 * x + b2
+lrt2(mp, bp) = baselrt(m2, b2, mp, bp)
+
+lr3(x) = m3 * x + b3
+lrt3(mp, bp) = baselrt(m3, b3, mp, bp)
+
+lr4(x) = m4 * x + b4
+lrt4(mp, bp) = baselrt(m4, b4, mp, bp)
+
+# }}}
 # Exporting --------------------------------------------------------------- {{{
 
 export(file, terminal) = sprintf( \
diff -r ccc0ace2e343 -r 6f0af1e0b0c9 gnuplot-scripts/black-and-white-lines-points.gp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnuplot-scripts/black-and-white-lines-points.gp	Mon Jul 13 11:52:11 2020 -0400
@@ -0,0 +1,25 @@
+set palette defined (0 '#111111', 1 '#eeeeee')
+
+set linetype  1 linewidth 1.25 pointtype 7  ps 1.0 linecolor rgb 'black' pointinterval -1 dt solid
+set linetype  2 linewidth 1.25 pointtype 1  ps 1.1 linecolor rgb 'black' pointinterval -1 dt '-'
+set linetype  3 linewidth 1.25 pointtype 9  ps 1.3 linecolor rgb 'black' pointinterval -1 dt '.'
+set linetype  4 linewidth 1.25 pointtype 6  ps 1.0 linecolor rgb 'black' pointinterval -1 dt (10, 5, 2, 5)
+set linetype  5 linewidth 1.25 pointtype 10 ps 1.3 linecolor rgb 'black' pointinterval -1 dt (8, 7, 2, 7, 2, 7)
+set linetype  6 linewidth 1.25 pointtype 7  ps 1.0 linecolor rgb 'black' pointinterval -1 dt solid
+set linetype  7 linewidth 1.25 pointtype 1  ps 1.1 linecolor rgb 'black' pointinterval -1 dt '-'
+set linetype  8 linewidth 1.25 pointtype 9  ps 1.3 linecolor rgb 'black' pointinterval -1 dt '.'
+set linetype  9 linewidth 1.25 pointtype 6  ps 1.0 linecolor rgb 'black' pointinterval -1 dt (10, 5, 2, 5)
+set linetype 10 linewidth 1.25 pointtype 10 ps 1.3 linecolor rgb 'black' pointinterval -1 dt (8, 7, 2, 7, 2, 7)
+
+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
diff -r ccc0ace2e343 -r 6f0af1e0b0c9 gnuplot-scripts/black-and-white-lines.gp
--- a/gnuplot-scripts/black-and-white-lines.gp	Mon Jul 13 11:51:28 2020 -0400
+++ b/gnuplot-scripts/black-and-white-lines.gp	Mon Jul 13 11:52:11 2020 -0400
@@ -1,15 +1,15 @@
 set palette defined (0 '#111111', 1 '#eeeeee')
 
-set linetype  1 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt ''
-set linetype  2 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt '-'
-set linetype  3 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt '.'
-set linetype  4 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt (10, 5, 2, 5)
-set linetype  5 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt (8, 7, 2, 7, 2, 7)
-set linetype  6 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt ''
-set linetype  7 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt '-'
-set linetype  8 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt '.'
-set linetype  9 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt (10, 5, 2, 5)
-set linetype 10 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' dt (8, 7, 2, 7, 2, 7)
+set linetype  1 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt solid
+set linetype  2 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt '-'
+set linetype  3 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt '.'
+set linetype  4 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt (10, 5, 2, 5)
+set linetype  5 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt (8, 7, 2, 7, 2, 7)
+set linetype  6 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt solid
+set linetype  7 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt '-'
+set linetype  8 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt '.'
+set linetype  9 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt (10, 5, 2, 5)
+set linetype 10 linewidth 1.25 pointtype 7 ps 1.0 linecolor rgb 'black' pointinterval -1 dt (8, 7, 2, 7, 2, 7)
 
 unset linetype 11
 unset linetype 12
@@ -22,4 +22,4 @@
 unset linetype 19
 unset linetype 20
 
-
+set linetype cycle 10
diff -r ccc0ace2e343 -r 6f0af1e0b0c9 gnuplot-scripts/black-and-white-points.gp
--- a/gnuplot-scripts/black-and-white-points.gp	Mon Jul 13 11:51:28 2020 -0400
+++ b/gnuplot-scripts/black-and-white-points.gp	Mon Jul 13 11:52:11 2020 -0400
@@ -1,15 +1,16 @@
 set palette defined (0 '#111111', 1 '#eeeeee')
 
-set linetype  1 linewidth 1.25 pointtype 7  ps 1.0 linecolor rgb 'black' dt ''
-set linetype  2 linewidth 1.25 pointtype 1  ps 1.1 linecolor rgb 'black' dt ''
-set linetype  3 linewidth 1.25 pointtype 9  ps 1.3 linecolor rgb 'black' dt ''
-set linetype  4 linewidth 1.25 pointtype 6  ps 1.0 linecolor rgb 'black' dt ''
-set linetype  5 linewidth 1.25 pointtype 10 ps 1.3 linecolor rgb 'black' dt ''
-set linetype  6 linewidth 1.25 pointtype 7  ps 1.0 linecolor rgb 'black' dt ''
-set linetype  7 linewidth 1.25 pointtype 1  ps 1.1 linecolor rgb 'black' dt ''
-set linetype  8 linewidth 1.25 pointtype 9  ps 1.3 linecolor rgb 'black' dt ''
-set linetype  9 linewidth 1.25 pointtype 6  ps 1.0 linecolor rgb 'black' dt ''
-set linetype 10 linewidth 1.25 pointtype 10 ps 1.3 linecolor rgb 'black' dt ''
+set linetype  1 linewidth 1.25 pointtype 7  ps 1.0 linecolor rgb 'black' dt solid pointinterval -1
+set linetype  2 linewidth 1.25 pointtype 1  ps 1.1 linecolor rgb 'black' dt solid pointinterval -1
+set linetype  3 linewidth 1.25 pointtype 6  ps 1.0 linecolor rgb 'black' dt solid pointinterval -1
+set linetype  4 linewidth 1.25 pointtype 8  ps 1.1 linecolor rgb 'black' dt solid pointinterval -1
+set linetype  5 linewidth 1.25 pointtype 4  ps 1.0 linecolor rgb 'black' dt solid pointinterval -1
+
+set linetype  6 linewidth 1.25 pointtype 7  ps 1.0 linecolor rgb 'black' dt solid pointinterval -1
+set linetype  7 linewidth 1.25 pointtype 1  ps 1.1 linecolor rgb 'black' dt solid pointinterval -1
+set linetype  8 linewidth 1.25 pointtype 6  ps 1.0 linecolor rgb 'black' dt solid pointinterval -1
+set linetype  9 linewidth 1.25 pointtype 8  ps 1.1 linecolor rgb 'black' dt solid pointinterval -1
+set linetype 10 linewidth 1.25 pointtype 4  ps 1.0 linecolor rgb 'black' dt solid pointinterval -1
 
 unset linetype 11
 unset linetype 12
diff -r ccc0ace2e343 -r 6f0af1e0b0c9 gnuplot-scripts/color.gp
--- a/gnuplot-scripts/color.gp	Mon Jul 13 11:51:28 2020 -0400
+++ b/gnuplot-scripts/color.gp	Mon Jul 13 11:52:11 2020 -0400
@@ -1,17 +1,16 @@
-set palette defined (0 '#fef0d9', 1 '#fdcc8a', 2 '#fc8d59', 3 '#d7301f')
 set palette defined (0 '#fef0d9', 1 '#d7301f', 2 '#fc8d59', 3 '#d7301f')
 
-set linetype  1 linewidth 1.25 pointtype 7  ps 1.0 linecolor rgb '#1f78b4'
-set linetype  2 linewidth 1.25 pointtype 1  ps 1.1 linecolor rgb '#33a02c'
-set linetype  3 linewidth 1.25 pointtype 9  ps 1.2 linecolor rgb '#e31a1c'
-set linetype  4 linewidth 1.25 pointtype 6  ps 1.0 linecolor rgb '#ff7f00'
-set linetype  5 linewidth 1.25 pointtype 10 ps 1.2 linecolor rgb '#6a3d9a'
+set linetype  1 linewidth 1.25 pointtype 7  ps 1.0 linecolor rgb '#1f78b4' pointinterval -1 dashtype solid
+set linetype  2 linewidth 1.25 pointtype 1  ps 1.1 linecolor rgb '#33a02c' pointinterval -1 dashtype solid
+set linetype  3 linewidth 1.25 pointtype 9  ps 1.2 linecolor rgb '#e31a1c' pointinterval -1 dashtype solid
+set linetype  4 linewidth 1.25 pointtype 6  ps 1.0 linecolor rgb '#ff7f00' pointinterval -1 dashtype solid
+set linetype  5 linewidth 1.25 pointtype 10 ps 1.2 linecolor rgb '#6a3d9a' pointinterval -1 dashtype solid
 
-set linetype  6 linewidth 1.5 pointtype 7  ps 1.0 linecolor rgb '#a6cee3'
-set linetype  7 linewidth 1.5 pointtype 1  ps 1.1 linecolor rgb '#b2df8a'
-set linetype  8 linewidth 1.5 pointtype 9  ps 1.2 linecolor rgb '#fb9a99'
-set linetype  9 linewidth 1.5 pointtype 6  ps 1.0 linecolor rgb '#fdbf6f'
-set linetype 10 linewidth 1.5 pointtype 10 ps 1.2 linecolor rgb '#cab2d6'
+set linetype  6 linewidth 1.5 pointtype 7  ps 1.0 linecolor rgb '#1f78b4' pointinterval -1 dt (10, 6)
+set linetype  7 linewidth 1.5 pointtype 1  ps 1.1 linecolor rgb '#33a02c' pointinterval -1 dt (2, 4)
+set linetype  8 linewidth 1.5 pointtype 9  ps 1.2 linecolor rgb '#e31a1c' pointinterval -1 dt (10, 5, 2, 5)
+set linetype  9 linewidth 1.5 pointtype 6  ps 1.0 linecolor rgb '#ff7f00' pointinterval -1 dt (8, 7, 2, 7, 2, 7)
+set linetype 10 linewidth 1.5 pointtype 10 ps 1.2 linecolor rgb '#6a3d9a' pointinterval -1 dt (8, 4, 2, 4, 2, 4, 2, 4)
 
 unset linetype 11
 unset linetype 12
diff -r ccc0ace2e343 -r 6f0af1e0b0c9 lisprc
--- a/lisprc	Mon Jul 13 11:51:28 2020 -0400
+++ b/lisprc	Mon Jul 13 11:52:11 2020 -0400
@@ -9,8 +9,8 @@
       *print-escape* t
       *print-right-margin* 100
       *print-miser-width* nil
-      *print-length* 1000
-      *print-level* 250)
+      *print-length* 50
+      *print-level* 50)
 
 ;;;; REPL Utilities -----------------------------------------------------------
 (defun :ls (package)
diff -r ccc0ace2e343 -r 6f0af1e0b0c9 lispwords
--- a/lispwords	Mon Jul 13 11:51:28 2020 -0400
+++ b/lispwords	Mon Jul 13 11:52:11 2020 -0400
@@ -126,8 +126,6 @@
 (1 make-option make-boolean-options)
 (1 quit-on-ctrl-c)
 
-; boots
-(1 with-layer)
 
 ; metabang-bind
 (1 bind)
diff -r ccc0ace2e343 -r 6f0af1e0b0c9 restic/excludes.txt
--- a/restic/excludes.txt	Mon Jul 13 11:51:28 2020 -0400
+++ b/restic/excludes.txt	Mon Jul 13 11:52:11 2020 -0400
@@ -10,6 +10,8 @@
 /home/sjl/.dbus
 /home/sjl/.dropbox
 /home/sjl/.dropbox-dist
+/home/sjl/.extra
+/home/sjl/.vault
 /home/sjl/.gimp-*
 /home/sjl/.go
 /home/sjl/.hg-git
@@ -22,6 +24,7 @@
 /home/sjl/.steam
 /home/sjl/.virtualenvs
 /home/sjl/Dropbox/.dropbox.cache
+/home/sjl/Pictures
 /home/sjl/Videos
 /home/sjl/dwhelper
 /home/sjl/snap
diff -r ccc0ace2e343 -r 6f0af1e0b0c9 stumpwmrc
--- a/stumpwmrc	Mon Jul 13 11:51:28 2020 -0400
+++ b/stumpwmrc	Mon Jul 13 11:52:11 2020 -0400
@@ -694,11 +694,11 @@
 
 
 ;;;; Startup ------------------------------------------------------------------
-(defvar *network-manager*
-  (run-shell-command "nm-applet --sm-disable"))
+;; (defvar *network-manager*
+  ;; (run-shell-command "nm-applet --sm-disable"))
 
-(defvar *dropbox*
-  (run-shell-command "~/.dropbox-dist/dropboxd"))
+;; (defvar *dropbox*
+  ;; (run-shell-command "~/.dropbox-dist/dropboxd"))
 
 (defvar *dunst*
   (run-shell-command "/usr/bin/dunst -conf ~/.dunstrc"))
diff -r ccc0ace2e343 -r 6f0af1e0b0c9 vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Mon Jul 13 11:51:28 2020 -0400
+++ b/vim/custom-dictionary.utf-8.add	Mon Jul 13 11:52:11 2020 -0400
@@ -305,3 +305,5 @@
 FastQC
 tradeoffs
 Hox
+deduplication
+deduplicating
diff -r ccc0ace2e343 -r 6f0af1e0b0c9 vim/vimrc
--- a/vim/vimrc	Mon Jul 13 11:51:28 2020 -0400
+++ b/vim/vimrc	Mon Jul 13 11:52:11 2020 -0400
@@ -2931,7 +2931,7 @@
 "
 " \h<space> - raw hg commands
 
-nnoremap <leader>hc :Start hg commit<cr>
+nnoremap <leader>hc :!hg commit<cr>
 
 nnoremap <leader>hpd :!hg push default<cr>
 nnoremap <leader>hpu :!hg push upstream<cr>
diff -r ccc0ace2e343 -r 6f0af1e0b0c9 xsessionrc
--- a/xsessionrc	Mon Jul 13 11:51:28 2020 -0400
+++ b/xsessionrc	Mon Jul 13 11:52:11 2020 -0400
@@ -16,7 +16,7 @@
 # xinput set-prop $TRACKPAD $CLICK 0, 1
 
 /home/sjl/src/dotfiles/bin/keysettings
-/home/sjl/src/dotfiles/bin/k-dammit &
+# /home/sjl/src/dotfiles/bin/k-dammit &
 
 xcape -t 200 -e 'Control_L=Escape;Shift_L=Shift_L|9;Shift_R=Shift_R|0'
 xautolock -time 30 -locker /home/sjl/src/dotfiles/bin/lock-screen &