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

diff -r 7de8b091e613 -r bf58a9cfeff2 .hgsubstate
--- a/.hgsubstate	Fri Feb 01 17:00:30 2019 -0500
+++ b/.hgsubstate	Fri Feb 01 17:00:39 2019 -0500
@@ -2,12 +2,12 @@
 1fc4a9fbead7e0acc4c828b346f3be2658ec3df9 mercurial/templates
 b6a8b49e2173ba5a1b34d00e68e0ed8addac3ebd vim/bundle/abolish
 a16a9b63eb85cc0960a7f25c54647ac1f99f3360 vim/bundle/ack
-5e4a535e2d239cba3db19b6b79abedbc7c541727 vim/bundle/badwolf
+1f53767227f0931e00a9e31e44c13633e563cd4c vim/bundle/badwolf
 b542a7bc4d9bc5da8fb12e110fe7975131fb57a4 vim/bundle/clam
 8295187ea1210138c0b171d8e3ec3569936f4c1a vim/bundle/commentary
 c6d1fc5e58d689bfb104ff336aeb89d9ef1b48e2 vim/bundle/ctrlp
 38487bbec8ba50834e257940b357de03991fa8f9 vim/bundle/delimitmate
-196e44837555e0e05080e6bc9dfc5605a06eaabb vim/bundle/fugitive
+085060002106f591e399fc5a82fa3fafc7586bca vim/bundle/fugitive
 127d706f2def96876605e6bd5d366c973cb8e406 vim/bundle/gdl
 6ea4e1983b18cf440c8f800a3e94b57338a3e99f vim/bundle/glsl
 7fcea1a08423da3012aac87f5224738c85d212a1 vim/bundle/gnupg
diff -r 7de8b091e613 -r bf58a9cfeff2 bin/sprint
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/sprint	Fri Feb 01 17:00:39 2019 -0500
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+# Usage:
+#
+#     sprint './some-command foo' pidfile
+#
+# Then another process can:
+#
+#     kill `cat pidfile`
+#
+# to refresh the underlying process.
+
+set -euo pipefail
+set -m
+
+PROGRAM="$1"
+shift
+PIDFILE="$1"
+shift
+
+echo "Starting ${PROGRAM}"
+while true; do
+    ${PROGRAM} &
+    echo $! > "${PIDFILE}"
+    fg >/dev/null || true
+    rm "${PIDFILE}"
+
+    echo "Restarting ${PROGRAM}"
+    sleep 1
+done
+
diff -r 7de8b091e613 -r bf58a9cfeff2 ffignore
--- a/ffignore	Fri Feb 01 17:00:30 2019 -0500
+++ b/ffignore	Fri Feb 01 17:00:39 2019 -0500
@@ -4,6 +4,7 @@
 banner.txt
 UnityTempFile
 .m2
+node_modules
 
 syntax:regex
 \btags$
diff -r 7de8b091e613 -r bf58a9cfeff2 gitconfig
--- a/gitconfig	Fri Feb 01 17:00:30 2019 -0500
+++ b/gitconfig	Fri Feb 01 17:00:39 2019 -0500
@@ -37,7 +37,7 @@
     di = !git diff --cached | nvim -R -
     dl = "!f() { git diff \"$@\" | nvim -R -c 'set ft=diff' -; }; f"
 
-    co = checkout
+    co = checkout --recurse-submodules
     id = rev-parse
 
     stat = status
@@ -56,7 +56,7 @@
     delete-local-reference-to-remote-branch = "!sh -c 'git branch -rd $1/$2' -"
     delete-remote-branch = "!sh -c 'git push $1 --delete $2' -"
     delete-branch = "!sh -c 'git delete-local-branch $1; git remotes | cut -f1 | sort | uniq | xargs -n1 -I % git delete-local-reference-to-remote-branch % $1' -"
-    delete-current-branch = "!bash -c 'git checkout master && git delete-branch $1' - $(git currentbranch)"
+    delete-current-branch = "!bash -c 'git checkout master && git delete-branch $1' - $(git current-branch)"
 
     current-branch = rev-parse --abbrev-ref HEAD
 
@@ -66,11 +66,11 @@
     po = push origin
     pu = push upstream
 
-    mo = !git merge --no-ff origin/`git currentbranch`
-    mu = !git merge --no-ff upstream/`git currentbranch`
+    mo = !git merge --no-ff origin/`git current-branch`
+    mu = !git merge --no-ff upstream/`git current-branch`
 
-    uo = !git merge --ff-only origin/`git currentbranch`
-    uu = !git merge --ff-only upstream/`git currentbranch`
+    uo = !git merge --ff-only origin/`git current-branch`
+    uu = !git merge --ff-only upstream/`git current-branch`
 
     fuu = "!sh -c 'git fu && git uu' -"
     fuo = "!sh -c 'git fo && git uo' -"
diff -r 7de8b091e613 -r bf58a9cfeff2 hgrc
--- a/hgrc	Fri Feb 01 17:00:30 2019 -0500
+++ b/hgrc	Fri Feb 01 17:00:39 2019 -0500
@@ -32,9 +32,12 @@
 cacerts = 
 
 [schemes]
+bb = https://bitbucket.org/
 bbs = ssh://hg@bitbucket.org/
 gh = git://github.com/
 ghs = git+ssh://git@github.com/
+sh = https://hg.sr.ht/~
+shs = ssh://hg@hg.sr.ht/~
 
 [diff]
 git = True
diff -r 7de8b091e613 -r bf58a9cfeff2 lisprc
--- a/lisprc	Fri Feb 01 17:00:30 2019 -0500
+++ b/lisprc	Fri Feb 01 17:00:39 2019 -0500
@@ -9,3 +9,17 @@
       *print-miser-width* nil
       *print-length* 1000
       *print-level* 250)
+
+
+; (defun prefix= (needle haystack)
+;   (string= needle haystack :end2 (min (length haystack) (length needle))))
+;
+; (defun https-please (url &rest args)
+;   ;; http://beta.quicklisp.org/
+;   (if (prefix= "http://beta.quicklisp.org/" url)
+;     (setf url (concatenate 'string "https://beta.quicklisp.org:443/"
+;                            (subseq url 26))))
+;   (print `(fetching ,url))
+;   (apply #'ql-http:http-fetch url args))
+;
+; (setf ql-http:*fetch-scheme-functions* '(("http" . https-please)))
diff -r 7de8b091e613 -r bf58a9cfeff2 vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Fri Feb 01 17:00:30 2019 -0500
+++ b/vim/custom-dictionary.utf-8.add	Fri Feb 01 17:00:39 2019 -0500
@@ -270,6 +270,8 @@
 jQuery
 deserializes
 healthchecks
+Nginx
+architecting
 CACL
 shaders
 vsync
diff -r 7de8b091e613 -r bf58a9cfeff2 vim/vimrc
--- a/vim/vimrc	Fri Feb 01 17:00:30 2019 -0500
+++ b/vim/vimrc	Fri Feb 01 17:00:39 2019 -0500
@@ -1118,6 +1118,7 @@
     au BufNewFile,BufRead *.asd,*.ros set filetype=lisp
     au BufNewFile,BufRead *.paren set filetype=lisp
     au BufNewFile,BufRead .abclrc set filetype=lisp
+    au BufNewFile,BufRead .lisprc set filetype=lisp
     au BufNewFile,BufRead .stumpwmrc set filetype=lisp
 
     au FileType lisp nnoremap <buffer> U :syntax sync fromstart<cr>:redraw!<cr>:call TurnOnLispFolding()<cr>
@@ -1402,6 +1403,9 @@
     au FileType go setlocal shiftwidth=8
     au FileType go setlocal foldmethod=syntax
     au FileType go nnoremap <buffer> <silent> M :GoDoc<cr>
+    au FileType go nnoremap <buffer> <localleader>t :GoInfo<cr>
+    au FileType go nnoremap <buffer> <localleader>h :GoDocBrowser<cr>
+    au FileType go nnoremap <buffer> <localleader>b :GoBuild<cr>
 
     " this language is incredible
     au FileType go iabbrev <buffer> ernil if err != nil {<cr>return nil, err<esc>jA
@@ -2178,6 +2182,7 @@
 let g:go_fmt_command = "goimports"
 let g:go_fmt_experimental = 1
 let g:go_doc_keywordprg_enabled = 0
+let g:go_def_mode = "godef"
 
 " }}}
 " Gundo {{{
diff -r 7de8b091e613 -r bf58a9cfeff2 weechat/plugins.conf
--- a/weechat/plugins.conf	Fri Feb 01 17:00:30 2019 -0500
+++ b/weechat/plugins.conf	Fri Feb 01 17:00:39 2019 -0500
@@ -73,6 +73,9 @@
 python.slack.auto_open_threads = "false"
 python.slack.background_load_all_history = "false"
 python.slack.channel_name_typing_indicator = "true"
+python.slack.color_buflist_muted_channels = "darkgray"
+python.slack.color_reaction_suffix = "darkgray"
+python.slack.color_thread_suffix = "lightcyan"
 python.slack.colorize_private_chats = "false"
 python.slack.debug_level = "3"
 python.slack.debug_mode = "false"
@@ -94,6 +97,7 @@
 python.slack.slack_api_token = "xoxp-3324703083-436133997184-447755985685-90585fad41071ee30fb518ad29831038"
 python.slack.slack_timeout = "20000"
 python.slack.switch_buffer_on_join = "true"
+python.slack.thread_messages_in_channel = "false"
 python.slack.thread_suffix_color = "lightcyan"
 python.slack.unfurl_auto_link_display = "both"
 python.slack.unfurl_ignore_alt_text = "false"
@@ -118,6 +122,9 @@
 python.slack.auto_open_threads = "Automatically open threads when mentioned or inresponse to own messages."
 python.slack.background_load_all_history = "Load history for each channel in the background as soon as it opens, rather than waiting for the user to look at it."
 python.slack.channel_name_typing_indicator = "Change the prefix of a channel from # to > when someone is typing in it. Note that this will (temporarily) affect the sort order if you sort buffers by name rather than by number."
+python.slack.color_buflist_muted_channels = "Color to use for muted channels in the buflist"
+python.slack.color_reaction_suffix = "Color to use for the [:wave:(@user)] suffix on messages that have reactions attached to them."
+python.slack.color_thread_suffix = "Color to use for the [thread: XXX] suffix on messages that have threads attached to them."
 python.slack.colorize_private_chats = "Whether to use nick-colors in DM windows."
 python.slack.debug_level = "Show only this level of debug info (or higher) when debug_mode is on. Lower levels -> more messages."
 python.slack.debug_mode = "Open a dedicated buffer for debug messages and start logging to it. How verbose the logging is depends on log_level."
@@ -138,6 +145,7 @@
 python.slack.slack_api_token = "List of Slack API tokens, one per Slack instance you want to connect to. See the README for details on how to get these."
 python.slack.slack_timeout = "How long (ms) to wait when communicating with Slack."
 python.slack.switch_buffer_on_join = "When /joining a channel, automatically switch to it as well."
+python.slack.thread_messages_in_channel = "When enabled shows thread messages in the parent channel."
 python.slack.thread_suffix_color = "Color to use for the [thread: XXX] suffix on messages that have threads attached to them."
 python.slack.unfurl_auto_link_display = "When displaying ("unfurling") links to channels/users/etc, determine what is displayed when the text matches the url without the protocol. This happens when Slack automatically creates links, e.g. from words separated by dots or email addresses. Set it to "text" to only display the text written by the user, "url" to only display the url or "both" (the default) to display both."
 python.slack.unfurl_ignore_alt_text = "When displaying ("unfurling") links to channels/users/etc, ignore the "alt text" present in the message and instead use the canonical name of the thing being linked to."
diff -r 7de8b091e613 -r bf58a9cfeff2 weechat/weechat.conf
--- a/weechat/weechat.conf	Fri Feb 01 17:00:30 2019 -0500
+++ b/weechat/weechat.conf	Fri Feb 01 17:00:39 2019 -0500
@@ -54,8 +54,8 @@
 day_change_message_2dates = "-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"
 eat_newline_glitch = off
 emphasized_attributes = ""
-highlight = "sjl,slosh,slj,clojerks,horrifying,remotes"
-highlight_regex = "(red[- ]tape|steve ?losh|rob ford|(jesus )?fucking christ|bring me my [A-Za-z0-9_]+ (pant|breeche|kilt|skirt|short|jort|plort)s?|(horse|mouse|clown)fuckers?|([[:<:]]((mother)?fuck([ie]ng?|er)?|(god?)?damn(ed)?|dammit|(bull|horse)?shite?)[[:>:]].*){3,}|actual footage|pork ?belly)"
+highlight = "sjl,slosh,slj,horrifying,steve.losh,@steve.losh,stevelosh"
+highlight_regex = "(steve losh|rob ford|(jesus )?fucking christ|(horse|mouse|clown)fuckers?|((mother)?fuck([ie]ng?|er)?|(god?)?damn(ed)?|dammit|(bull|horse)?shite?){3,})"
 highlight_tags = ""
 hotlist_add_conditions = "${away} || ${buffer.num_displayed} == 0"
 hotlist_buffer_separator = ", "
@@ -133,7 +133,7 @@
 window_separator_horizontal = on
 window_separator_vertical = on
 window_title = ""
-word_chars_highlight = "!\u00A0,-,_,|,alnum"
+word_chars_highlight = "!\u00A0,-,_,|,@,.,alnum"
 word_chars_input = "!\u00A0,-,_,|,alnum"
 
 [palette]