From f9220da4926c74b434debe24569a95a417bd2697 Mon Sep 17 00:00:00 2001
From: Rob Watson <rob@netflux.io>
Date: Mon, 15 Mar 2021 16:29:40 +0100
Subject: [PATCH] Various updates

---
 vim/after/ftplugin/go.vim | 7 +++++++
 vimrc                     | 5 +++--
 zshrc                     | 3 +++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/vim/after/ftplugin/go.vim b/vim/after/ftplugin/go.vim
index 09bede4..d7efbd4 100644
--- a/vim/after/ftplugin/go.vim
+++ b/vim/after/ftplugin/go.vim
@@ -1,10 +1,13 @@
 nmap <leader>gb :GoBuild<cr>
+nmap <leader>gr :GoRun<cr>
 nmap <leader>gc :GoCallers<cr>
 nmap <leader>gi :GoImplements<cr>
 nmap <leader>^ :GoAlternate<cr>
 nmap <leader>gk :GoDocBrowser<cr>
 nmap <leader>gd :GoDecls<cr>
 nmap <leader>gD :GoDeclsDir<cr>
+" mnemonic: match
+nmap <leader>gm :GoSameIds<cr>
 
 nmap <leader>gv <esc>:vsplit<bar>:GoAlternate!<cr>
 nmap <leader>gs <esc>:split<bar>:GoAlternate!<cr>
@@ -64,3 +67,7 @@ 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("
diff --git a/vimrc b/vimrc
index 463925a..30f07df 100644
--- a/vimrc
+++ b/vimrc
@@ -78,7 +78,7 @@ if exists('+termguicolors')
 endif
 
 " Colour scheme:
-colorscheme nord
+colorscheme iceberg
 
 augroup vimrc
   autocmd!
@@ -151,7 +151,8 @@ inoremap <expr><C-]> pumvisible() ? "\<C-]>" : "\<Enter>"
 let g:vim_markdown_conceal = 1
 
 " fzf configuration:
-nmap <leader>t :GFiles<cr>
+nmap <leader>t :Files<cr>
+nmap <leader>T :GFiles<cr>
 nmap <leader>b :Buffers<cr>
 nmap <leader>gg :Rg<cr>
 
diff --git a/zshrc b/zshrc
index c2d4e37..e0b98e4 100644
--- a/zshrc
+++ b/zshrc
@@ -127,12 +127,15 @@ git config --global alias.st status
 git config --global alias.br branch
 
 # Other aliases
+alias ll="exa -l --group-directories-first --git"
 alias sysc="systemctl"
 alias hib="sudo systemctl hibernate"
 alias dc="docker-compose -f docker-compose.yml"
 alias dcd="docker-compose -f docker-compose.yml -f docker-compose.development.yml"
 alias clp="tmux kill-pane"
 alias clw="tmux kill-window"
+alias pk="pkill -fc"
+alias pg="pgrep -fa"
 alias updatevimplugins="cd $HOME/.vim/pack/git-plugins && find . -mindepth 2 -maxdepth 2 -type d | xargs -I{} bash -c 'cd {} ; printf \"In {}...\"; git pull --rebase' ; cd -"
 
 # recursive grep with line numbers and colour, ignoring binary files: