# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1596823926 14400
# Node ID f89078a3dc080503d39e8146ada5c0156a2da776
# Parent  50ced2860f224d4ec2cd28da96f45d32bfceabe8
More

diff -r 50ced2860f22 -r f89078a3dc08 .hgsub
--- a/.hgsub	Wed Jul 29 18:14:24 2020 -0400
+++ b/.hgsub	Fri Aug 07 14:12:06 2020 -0400
@@ -31,6 +31,7 @@
 vim/bundle/sexp                  = [git]https://github.com/guns/vim-sexp
 vim/bundle/shaderhighlight       = [git]https://github.com/vim-scripts/ShaderHighLight
 vim/bundle/shellcheck            = [git]https://github.com/itspriddle/vim-shellcheck
+vim/bundle/sparkup               = [git]https://github.com/rstacruz/sparkup
 vim/bundle/splice                = [hg]ssh://hg.stevelosh.com/repos/splice.vim
 vim/bundle/strftimedammit        = [hg]ssh://hg.stevelosh.com/repos/strftimedammit.vim/
 vim/bundle/surround              = [git]https://github.com/tpope/vim-surround
diff -r 50ced2860f22 -r f89078a3dc08 .hgsubstate
--- a/.hgsubstate	Wed Jul 29 18:14:24 2020 -0400
+++ b/.hgsubstate	Fri Aug 07 14:12:06 2020 -0400
@@ -31,6 +31,7 @@
 b4398689f7483b01684044ab6b55bf369744c9b3 vim/bundle/sexp
 e02c3e218c51c1e2ea1821a3fe412d4e09ca1502 vim/bundle/shaderhighlight
 4346419ac57ef341a15aa39c827c0848f17c6faf vim/bundle/shellcheck
+d400a570bf64b0c216aa7c8e1795820b911a7404 vim/bundle/sparkup
 062b18eebd153c13e6f36577707acb17893cd959 vim/bundle/splice
 26fbdd7d1f1aa5600d2ebf39bbdd292c38aac16e vim/bundle/strftimedammit
 aa1f120ad3a29c27cc41d581cda3751c59343cce vim/bundle/surround
diff -r 50ced2860f22 -r f89078a3dc08 bin/bootstrap.sh
--- a/bin/bootstrap.sh	Wed Jul 29 18:14:24 2020 -0400
+++ b/bin/bootstrap.sh	Fri Aug 07 14:12:06 2020 -0400
@@ -56,6 +56,7 @@
 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/w3m-config"             ".w3m/config"
 ensure_link "src/dotfiles/weechat"                ".weechat"
 ensure_link "src/dotfiles/xbindkeysrc"            ".xbindkeysrc"
 ensure_link "src/dotfiles/xsessionrc"             ".xsessionrc"
diff -r 50ced2860f22 -r f89078a3dc08 bin/doc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/doc	Fri Aug 07 14:12:06 2020 -0400
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+LANG=$1
+shift
+
+if test "$LANG" -eq "go"; then
+    LANG=golang
+fi
+
+QUERY=$(echo -n "$@" | urlencode)
+
+w3m "https://duckduckgo.com/?q=$LANG+$QUERY"
diff -r 50ced2860f22 -r f89078a3dc08 gitconfig
--- a/gitconfig	Wed Jul 29 18:14:24 2020 -0400
+++ b/gitconfig	Fri Aug 07 14:12:06 2020 -0400
@@ -33,6 +33,9 @@
     ci = commit
     cm = commit -m
 
+    rom = rebase origin/master
+    rec = rebase --continue
+
     d = diff
     di = diff --cached
     dl = "!f() { git diff \"$@\" | nvim -R -c 'set ft=diff' -; }; f"
diff -r 50ced2860f22 -r f89078a3dc08 vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Wed Jul 29 18:14:24 2020 -0400
+++ b/vim/custom-dictionary.utf-8.add	Fri Aug 07 14:12:06 2020 -0400
@@ -308,3 +308,4 @@
 deduplication
 deduplicating
 passlist
+golang
diff -r 50ced2860f22 -r f89078a3dc08 vim/vimrc
--- a/vim/vimrc	Wed Jul 29 18:14:24 2020 -0400
+++ b/vim/vimrc	Fri Aug 07 14:12:06 2020 -0400
@@ -1497,6 +1497,8 @@
     au FileType go nnoremap <buffer> <localleader>h :GoDocBrowser<cr>
     au FileType go nnoremap <buffer> <localleader>c :GoBuild<cr>
 
+    au FileType go inoremap <c-n> <c-x><c-o>
+
     " this language is incredible
     au FileType go iabbrev <buffer> ernil if err != nil {<cr>return nil, err<esc>jA
     au FileType go iabbrev <buffer> erstr if err != nil {<cr>return "", err<esc>jA
@@ -1515,26 +1517,26 @@
 augroup END
 
 " }}}
-" HTML, Django, Jinja, Dram {{{
+" HTML, Django, Jinja, Dram, Go, Kill Me {{{
 
 let g:html_indent_tags = ['p', 'li']
 
 augroup ft_html
     au!
 
-    au BufNewFile,BufRead *.html setlocal filetype=htmldjango
+    au BufNewFile,BufRead *.html setlocal filetype=gohtmltmpl
     au BufNewFile,BufRead *.dram setlocal filetype=htmldjango
 
-    au FileType html,jinja,htmldjango setlocal foldmethod=manual
+    au FileType html,jinja,htmldjango,gohtmltmpl setlocal foldmethod=manual
 
     " Use <localleader>f to fold the current tag.
-    au FileType html,jinja,htmldjango nnoremap <buffer> <localleader>f Vatzf
+    au FileType html,jinja,htmldjango,gohtmltmpl nnoremap <buffer> <localleader>f Vatzf
 
     " Use <localleader>t to fold the current templatetag.
     au FileType html,jinja,htmldjango nmap <buffer> <localleader>t viikojozf
 
     " Indent tag
-    au FileType html,jinja,htmldjango nnoremap <buffer> <localleader>= Vat=
+    au FileType html,jinja,htmldjango,gohtmltmpl nnoremap <buffer> <localleader>= Vat=
 
     " Django tags
     au FileType jinja,htmldjango inoremap <buffer> <c-t> {%<space><space>%}<left><left><left>
diff -r 50ced2860f22 -r f89078a3dc08 w3m-config
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/w3m-config	Fri Aug 07 14:12:06 2020 -0400
@@ -0,0 +1,1 @@
+meta_refresh 1