# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1594655342 14400
# Node ID 05244afc5b3fdb381166746ea5faa7b057bb78c8
# Parent  13ec2c64c7a6042d51bda1e01908eeb9919ba9a5
More

diff -r 13ec2c64c7a6 -r 05244afc5b3f .hgsubstate
--- a/.hgsubstate	Wed Jun 17 12:29:36 2020 -0400
+++ b/.hgsubstate	Mon Jul 13 11:49:02 2020 -0400
@@ -36,7 +36,7 @@
 aa1f120ad3a29c27cc41d581cda3751c59343cce vim/bundle/surround
 19c3d966440b6cfe8d74251881a48e961ddb8648 vim/bundle/swig
 f6f2d6618a321f5b0065586a7bc934325fec81ab vim/bundle/targets
-c860f7c3ae0e0287f143a5b3e58873fc0a9fbda9 vim/bundle/vim-go
+2c6bffb492f4f9b101e45610b0d7b9c328916894 vim/bundle/vim-go
 5d5c71044880443035e07009497962feacb56b20 vim/bundle/vimtex
 3203be247b574529f1c43973e4f7294abcda392b vim/bundle/vlime
 6876fe38b33732cb124d415ffc4156f16da5e118 vim/bundle/windowswap
diff -r 13ec2c64c7a6 -r 05244afc5b3f bin/cmrm
--- a/bin/cmrm	Wed Jun 17 12:29:36 2020 -0400
+++ b/bin/cmrm	Mon Jul 13 11:49:02 2020 -0400
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
 set -euo pipefail
+set -x
 
 rm ~/.ssh/controlmaster/*
+ps auxww | grep 'ssh.*[.]sock.*mux' | f 2 | xargs kill
diff -r 13ec2c64c7a6 -r 05244afc5b3f fish/config.fish
--- a/fish/config.fish	Wed Jun 17 12:29:36 2020 -0400
+++ b/fish/config.fish	Mon Jul 13 11:49:02 2020 -0400
@@ -14,6 +14,7 @@
 
 function js; cd ~/scratch; end
 function jd; cd /dump; end
+function jl; cd ~/scratch/logs; end
 
 function histgrep; history | grep "$argv" | tac; end
 
@@ -134,6 +135,7 @@
 # Go {{{
 
 set -g -x GOPATH "$HOME/.go"
+set -g -x GOSUMDB off
 
 # }}}
 # R {{{
diff -r 13ec2c64c7a6 -r 05244afc5b3f mutt/muttrc
--- a/mutt/muttrc	Wed Jun 17 12:29:36 2020 -0400
+++ b/mutt/muttrc	Mon Jul 13 11:49:02 2020 -0400
@@ -56,7 +56,7 @@
 
 set pgp_import_command="gpg --no-verbose --import -v %f"
 set pgp_export_command="gpg --no-verbose --export --armor %r"
-set pgp_list_pubring_command="gpg --no-verbose --batch --with-colons --list-keys %r" 
+set pgp_list_pubring_command="gpg --no-verbose --batch --with-colons --list-keys %r"
 set pgp_list_secring_command="gpg --no-verbose --batch --with-colons --list-secret-keys %r"
 
 set crypt_verify_sig=yes
@@ -171,10 +171,13 @@
 bind index p        recall-message
 bind index <space>  collapse-thread
 bind index N        search-opposite
-bind index <f1>     sort-mailbox
 bind index B        sidebar-toggle-visible
 # macro index s "<pipe-message>cat > ~/Desktop/"  "save message as"
 
+# Sorting
+macro index <f1> "<enter-command>set sort = threads<enter><enter-command>set sort_aux = reverse-last-date-received<enter>" "sort with newest first"
+macro index <f2> "<enter-command>set sort = threads<enter><enter-command>set sort_aux = date-received<enter>" "sort with oldest first"
+
 # Mark all as read
 macro index \Cr "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
 
diff -r 13ec2c64c7a6 -r 05244afc5b3f vim/vimrc
--- a/vim/vimrc	Wed Jun 17 12:29:36 2020 -0400
+++ b/vim/vimrc	Mon Jul 13 11:49:02 2020 -0400
@@ -84,6 +84,7 @@
 " Better Completion
 set complete=.,w,b,u,t
 set completeopt=longest,menuone
+inoremap <c-o> <c-x><c-o>
 
 " Save when losing focus
 au FocusLost * :silent! wall
@@ -2135,6 +2136,7 @@
     au FileType lisp setlocal commentstring=;;\ %s
     au FileType makerlisp setlocal commentstring=;;\ %s
     au FileType puppet setlocal commentstring=#\ %s
+    au FileType nginx setlocal commentstring=#\ %s
     au FileType fish setlocal commentstring=#\ %s
     au FileType gnuplot setlocal commentstring=#\ %s
     au FileType cs setlocal commentstring=//\ %s
@@ -2206,8 +2208,14 @@
 " }}}
 " Go {{{
 
-let g:go_fmt_command = "goimports"
+let g:go_fmt_command = "gofmt"
+let g:go_fmt_options = {
+    \ 'gofmt': '-s',
+    \ 'goimports': '',
+    \ }
 let g:go_fmt_experimental = 1
+let g:go_fmt_autosave = 1
+let g:go_imports_autosave = 1
 let g:go_doc_keywordprg_enabled = 0
 let g:go_def_mode = "godef"