From 08ea08f4a32a45a1be3489163f6a865a918c26f9 Mon Sep 17 00:00:00 2001
From: Rob Watson <rob@netflux.io>
Date: Fri, 8 Oct 2021 14:27:22 +0200
Subject: [PATCH] Update gitconfig, tmux.conf and go.vim

---
 gitconfig                 | 1 +
 tmux.conf                 | 1 +
 vim/after/ftplugin/go.vim | 7 -------
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/gitconfig b/gitconfig
index 250d1f8..4298882 100644
--- a/gitconfig
+++ b/gitconfig
@@ -6,6 +6,7 @@
 	acf = !git add . && git cf
 	adp = add -p
 	an = add -N .
+	adn = an
 	b = branch
 	bn = rev-parse --abbrev-ref HEAD
 	br = branch
diff --git a/tmux.conf b/tmux.conf
index 245a4d6..837789b 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -7,6 +7,7 @@ set -g base-index 1
 set-window-option -g automatic-rename off
 set-window-option -g allow-rename off
 set-option -g set-titles on
+set-option -g focus-events on
 set -g status-style 'fg=white, bg=colour8'
 set -g window-status-current-style 'fg=black, bg=green'
 set -g status-right '#[fg=black, bg=colour2] #(sysinfo) #[default] #[fg=white, bg=colour238] %H:%M #[default]'
diff --git a/vim/after/ftplugin/go.vim b/vim/after/ftplugin/go.vim
index b5f158f..3962ad1 100644
--- a/vim/after/ftplugin/go.vim
+++ b/vim/after/ftplugin/go.vim
@@ -7,7 +7,6 @@ nmap <silent> <leader>gF :up<bar>:GoTestFunc<cr>
 nmap <silent> <leader>gj :GoDecls<cr>
 nmap <silent> <leader>gJ :GoDeclsDir<cr>
 
-nmap <silent> K <plug>(lsp-hover)
 nmap <silent> <leader>gk :GoDocBrowser<cr>
 
 nmap <silent> <leader>gv :vsplit<bar>:GoAlternate!<cr>
@@ -56,9 +55,6 @@ iabbrev fmtpl fmt.Println("")<esc>hi
 iabbrev fmtpf fmt.Printf("\n")<esc>3hi
 iabbrev mk make([]MyType, 0)<esc>9h
 iabbrev wr w http.ResponseWriter, r *http.Request
-iabbrev httph http.Handler
-iabbrev httphf http.HandlerFunc
-iabbrev fttt <ESC>ccfunc TestSomething(t *testing.T) {<cr>}<esc>k9l
 iabbrev ttt t *testing.T
 iabbrev errP <esc>ccif err != nil {<cr>panic(err)<cr>}
 iabbrev errl <esc>ccif err != nil {<cr>log.Println(err)<cr>}
@@ -66,11 +62,8 @@ iabbrev errf <esc>ccif err != nil {<cr>log.Fatal(err)<cr>}
 iabbrev errp <esc>ccif err != nil {<cr>fmt.Println(err)<cr>}
 iabbrev errr <esc>ccif err != nil {<cr>return err<cr>}
 iabbrev defr <esc>ccdefer func() {<cr><cr>}()<esc>ki
-iabbrev []b []byte()<esc>i
 iabbrev logd log.Debug().Msg("
 iabbrev logi log.Info().Msg("
 iabbrev loge log.Error().Msg("
 iabbrev logf log.Fatal().Msg("
-iabbrev rn return nil
-iabbrev fnc func() {<cr><cr>}<esc>kcc
 iabbrev ctxcc ctx context.Context