# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1549058439 18000
# Node ID bf58a9cfeff24fe70dca15073b44465f09d8d4a5
# Parent  7de8b091e613d56ad9a8d3f9d88a953c217da125# Parent  d3cf0122bca64e368bed37b723ad1b74aac0c569
Merge.

diff -r d3cf0122bca6 -r bf58a9cfeff2 bin/bootstrap.sh
--- a/bin/bootstrap.sh	Fri Feb 01 15:14:20 2019 -0500
+++ b/bin/bootstrap.sh	Fri Feb 01 17:00:39 2019 -0500
@@ -26,37 +26,37 @@
 
 test -d ~/src/dotfiles || hg clone http://bitbucket.org/sjl/dotfiles ~/src/dotfiles
 
-ensure_link "src/dotfiles/Xmodmap"              ".Xmodmap"
-ensure_link "src/dotfiles/abclrc"               ".abclrc"
-ensure_link "src/dotfiles/agignore"             ".agignore"
-ensure_link "src/dotfiles/bash_profile"         ".bash_profile"
-ensure_link "src/dotfiles/browsrc"              ".browsrc"
-ensure_link "src/dotfiles/ccl-init.lisp"        ".ccl-init.lisp"
-ensure_link "src/dotfiles/config-nvim-init.vim" ".config/nvim/init.vim"
-ensure_link "src/dotfiles/ctags"                ".ctags"
-ensure_link "src/dotfiles/dunstrc"              ".dunstrc"
-ensure_link "src/dotfiles/eclrc"                ".eclrc"
-ensure_link "src/dotfiles/ffignore"             ".ffignore"
-ensure_link "src/dotfiles/fish/config.fish"     ".config/fish/config.fish"
-ensure_link "src/dotfiles/fish/functions"       ".config/fish/functions"
-ensure_link "src/dotfiles/gitconfig"            ".gitconfig"
-ensure_link "src/dotfiles/gitignore"            ".gitignore"
-ensure_link "src/dotfiles/hgignore"             ".hgignore"
-ensure_link "src/dotfiles/lisprc"               ".lisprc"
-ensure_link "src/dotfiles/lispwords"            ".lispwords"
-ensure_link "src/dotfiles/mutt"                 ".mutt"
-ensure_link "src/dotfiles/mutt/mailcap"         ".mailcap"
-ensure_link "src/dotfiles/mutt/muttrc"          ".muttrc"
-ensure_link "src/dotfiles/mutt/notmuch-config"  ".notmuch-config"
-ensure_link "src/dotfiles/psqlrc"               ".psqlrc"
-ensure_link "src/dotfiles/sbclrc"               ".sbclrc"
-ensure_link "src/dotfiles/stumpwmrc"            ".stumpwmrc"
-ensure_link "src/dotfiles/tmux/tmux.conf"       ".tmux.conf"
-ensure_link "src/dotfiles/vim"                  ".vim"
-ensure_link "src/dotfiles/vim/vimrc"            ".vimrc"
-ensure_link "src/dotfiles/w3m-keymap"           ".w3m/keymap"
-ensure_link "src/dotfiles/weechat"              ".weechat"
-ensure_link "src/dotfiles/xbindkeysrc"          ".xbindkeysrc"
-ensure_link "src/dotfiles/xsessionrc"           ".xsessionrc"
+ensure_link "src/dotfiles/Xmodmap"                ".Xmodmap"
+ensure_link "src/dotfiles/abclrc"                 ".abclrc"
+ensure_link "src/dotfiles/agignore"               ".agignore"
+ensure_link "src/dotfiles/bash_profile"           ".bash_profile"
+ensure_link "src/dotfiles/browsrc"                ".browsrc"
+ensure_link "src/dotfiles/ccl-init.lisp"          ".ccl-init.lisp"
+ensure_link "src/dotfiles/config-nvim-init.vim"   ".config/nvim/init.vim"
+ensure_link "src/dotfiles/ctags"                  ".ctags"
+ensure_link "src/dotfiles/dunstrc"                ".dunstrc"
+ensure_link "src/dotfiles/eclrc"                  ".eclrc"
+ensure_link "src/dotfiles/ffignore"               ".ffignore"
+ensure_link "src/dotfiles/fish/config.fish"       ".config/fish/config.fish"
+ensure_link "src/dotfiles/fish/functions"         ".config/fish/functions"
+ensure_link "src/dotfiles/gitconfig"              ".gitconfig"
+ensure_link "src/dotfiles/gitignore"              ".gitignore"
+ensure_link "src/dotfiles/hgignore"               ".hgignore"
+ensure_link "src/dotfiles/lisprc"                 ".lisprc"
+ensure_link "src/dotfiles/lispwords"              ".lispwords"
+ensure_link "src/dotfiles/mutt"                   ".mutt"
+ensure_link "src/dotfiles/mutt/mailcap"           ".mailcap"
+ensure_link "src/dotfiles/mutt/muttrc"            ".muttrc"
+ensure_link "src/dotfiles/mutt/notmuch-config"    ".notmuch-config"
+ensure_link "src/dotfiles/psqlrc"                 ".psqlrc"
+ensure_link "src/dotfiles/sbclrc"                 ".sbclrc"
+ensure_link "src/dotfiles/stumpwmrc"              ".stumpwmrc"
+ensure_link "src/dotfiles/tmux/tmux.conf"         ".tmux.conf"
+ensure_link "src/dotfiles/vim"                    ".vim"
+ensure_link "src/dotfiles/vim/vimrc"              ".vimrc"
+ensure_link "src/dotfiles/w3m-keymap"             ".w3m/keymap"
+ensure_link "src/dotfiles/weechat"                ".weechat"
+ensure_link "src/dotfiles/xbindkeysrc"            ".xbindkeysrc"
+ensure_link "src/dotfiles/xsessionrc"             ".xsessionrc"
 
 echo done
diff -r d3cf0122bca6 -r bf58a9cfeff2 bin/msmtp-stevelosh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/msmtp-stevelosh	Fri Feb 01 17:00:39 2019 -0500
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+/usr/bin/msmtp -a stevelosh "$@"
diff -r d3cf0122bca6 -r bf58a9cfeff2 gitconfig
--- a/gitconfig	Fri Feb 01 15:14:20 2019 -0500
+++ b/gitconfig	Fri Feb 01 17:00:39 2019 -0500
@@ -116,3 +116,6 @@
 
 [credential]
     helper = store
+
+[sendemail]
+    smtpserver = "/home/sjl/src/dotfiles/bin/msmtp-stevelosh"
diff -r d3cf0122bca6 -r bf58a9cfeff2 hgrc
--- a/hgrc	Fri Feb 01 15:14:20 2019 -0500
+++ b/hgrc	Fri Feb 01 17:00:39 2019 -0500
@@ -72,18 +72,17 @@
 **.prefab = unityyamlmerge
 
 [email]
-method = smtp
+method = msmtp-stevelosh
 from = Steve Losh <steve@stevelosh.com>
 
 [subrepos]
 git:allowed = true
 
-# TODO: Fastmail
-# [smtp]
-# host = smtp.gmail.com
-# port = 587
-# username = steve@stevelosh.com
-# tls = True
+[smtp]
+host = smtp.fastmail.com
+port = 465
+username = steve@stevelosh.com
+tls = True
 
 [color]
 status.modified = cyan
diff -r d3cf0122bca6 -r bf58a9cfeff2 restic/excludes.txt
--- a/restic/excludes.txt	Fri Feb 01 15:14:20 2019 -0500
+++ b/restic/excludes.txt	Fri Feb 01 17:00:39 2019 -0500
@@ -3,6 +3,8 @@
 /home/sjl/.dbus
 /home/sjl/src/dotfiles/vim/tmp
 /home/sjl/snap
+/home/sjl/Videos
+/home/sjl/dwhelper
 /home/sjl/.mozilla
 /home/sjl/.dropbox
 /home/sjl/.steam
diff -r d3cf0122bca6 -r bf58a9cfeff2 vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Fri Feb 01 15:14:20 2019 -0500
+++ b/vim/custom-dictionary.utf-8.add	Fri Feb 01 17:00:39 2019 -0500
@@ -274,3 +274,4 @@
 architecting
 CACL
 shaders
+vsync