# HG changeset patch # User Steve Losh # Date 1549134991 18000 # Node ID d436478438d93c618208d7d6b0816f662ff502c7 # Parent 634d093b174a1c3d330765e3edd4991f20ba4516# Parent f6d35d12a2a58c2ac49fd1181ef0a55d1c060454 Merge. diff -r f6d35d12a2a5 -r d436478438d9 bin/bootstrap.sh --- a/bin/bootstrap.sh Fri Feb 01 15:15:04 2019 -0500 +++ b/bin/bootstrap.sh Sat Feb 02 14:16:31 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 f6d35d12a2a5 -r d436478438d9 bin/msmtp-stevelosh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bin/msmtp-stevelosh Sat Feb 02 14:16:31 2019 -0500 @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +/usr/bin/msmtp -a stevelosh "$@" diff -r f6d35d12a2a5 -r d436478438d9 gitconfig --- a/gitconfig Fri Feb 01 15:15:04 2019 -0500 +++ b/gitconfig Sat Feb 02 14:16:31 2019 -0500 @@ -116,3 +116,6 @@ [credential] helper = store + +[sendemail] + smtpserver = "/home/sjl/src/dotfiles/bin/msmtp-stevelosh" diff -r f6d35d12a2a5 -r d436478438d9 hgrc --- a/hgrc Fri Feb 01 15:15:04 2019 -0500 +++ b/hgrc Sat Feb 02 14:16:31 2019 -0500 @@ -72,18 +72,17 @@ **.prefab = unityyamlmerge [email] -method = smtp +method = msmtp-stevelosh from = Steve Losh [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 f6d35d12a2a5 -r d436478438d9 restic/excludes.txt --- a/restic/excludes.txt Fri Feb 01 15:15:04 2019 -0500 +++ b/restic/excludes.txt Sat Feb 02 14:16:31 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 f6d35d12a2a5 -r d436478438d9 vim/custom-dictionary.utf-8.add --- a/vim/custom-dictionary.utf-8.add Fri Feb 01 15:15:04 2019 -0500 +++ b/vim/custom-dictionary.utf-8.add Sat Feb 02 14:16:31 2019 -0500 @@ -274,3 +274,4 @@ architecting CACL shaders +vsync diff -r f6d35d12a2a5 -r d436478438d9 vim/vimrc --- a/vim/vimrc Fri Feb 01 15:15:04 2019 -0500 +++ b/vim/vimrc Sat Feb 02 14:16:31 2019 -0500 @@ -1417,8 +1417,11 @@ augroup ft_hgrc au! - " s/bbs/ghs/ + " s/shs/ghs/ au BufReadPost,BufNewFile hgrc nnoremap g yypciwgitwwcwghsA.git + + " s/shs/bbs/ + au BufReadPost,BufNewFile hgrc nnoremap g yypciwbitwwcwghsA.git augroup END " }}} @@ -1516,6 +1519,7 @@ au! au Filetype mail setlocal spell + au FileType mail setlocal textwidth=72 augroup END " }}}