From f05c957743f1d7cb330b09d3367aecc15b4a7501 Mon Sep 17 00:00:00 2001
From: Rob Watson <rob@netflux.io>
Date: Fri, 26 Mar 2021 17:24:46 +0100
Subject: [PATCH] Update vimrc and zshrc

---
 gitconfig                 | 1 +
 vim/after/ftplugin/go.vim | 1 +
 vimrc                     | 6 ++++--
 zshrc                     | 3 +++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gitconfig b/gitconfig
index c7547db..be41f09 100644
--- a/gitconfig
+++ b/gitconfig
@@ -26,6 +26,7 @@
 	rr = !git reset --hard $(git rb)
 	shp = show -p
 	s = status
+	sq = merge --squash
 	ss = stash save
 	st = status
 	undo = reset --soft HEAD^
diff --git a/vim/after/ftplugin/go.vim b/vim/after/ftplugin/go.vim
index d41d465..e7cd838 100644
--- a/vim/after/ftplugin/go.vim
+++ b/vim/after/ftplugin/go.vim
@@ -63,3 +63,4 @@ iabbrev logd log.Debug().Msg("
 iabbrev logi log.Info().Msg("
 iabbrev loge log.Error().Msg("
 iabbrev logf log.Fatal().Msg("
+iabbrev rn return nil
diff --git a/vimrc b/vimrc
index 070dda8..018414b 100644
--- a/vimrc
+++ b/vimrc
@@ -118,6 +118,8 @@ nnoremap <silent> <leader>/ :nohlsearch<cr>
 nnoremap <silent> <leader><space> :nohlsearch<cr>
 " Select just-pasted text:
 nnoremap <silent> <leader>0 `[v`]
+" Select just-pasted text and re-indent:
+nnoremap <silent> <leader>) `[v`]=
 nnoremap <silent> <leader>1 :set relativenumber!<cr>
 nnoremap <leader>m :marks<cr>
 nnoremap <leader>v :vsplit<cr>
@@ -320,11 +322,11 @@ function! s:on_lsp_buffer_enabled() abort
     " Misc actions
     nmap <buffer> <leader>ci <plug>(lsp-call-hierarchy-incoming)
     nmap <buffer> <leader>co <plug>(lsp-call-hierarchy-outgoing)
-    nmap <buffer> <leader>a <plug>(lsp-code-action)
+    nmap <buffer> <leader>ca <plug>(lsp-code-action)
     nmap <buffer> <leader>i <plug>(lsp-implementation)
     nmap <buffer> <leader>r <plug>(lsp-references)
     nmap <buffer> <leader>d <plug>(lsp-hover)
-    nmap <buffer> <leader>o :LspCodeAction source.organizeImports<cr>
+    nmap <buffer> <leader>o :silent LspCodeAction source.organizeImports<cr>
 
     nmap <buffer> <leader>e <plug>(lsp-rename)
 endfunction
diff --git a/zshrc b/zshrc
index ac4ee7b..7920166 100644
--- a/zshrc
+++ b/zshrc
@@ -131,6 +131,9 @@ alias c.="cd .."
 alias c-="cd -"
 alias cdgit='cd $(git rev-parse --show-toplevel)'
 alias cdg=cdgit
+alias gg="go get"
+alias gt="go test"
+alias gb="go build"
 alias ll="exa -l --group-directories-first --git"
 alias sysc="systemctl"
 alias zzz="sudo systemctl hibernate"