From a1f6b7d163beb2cc2b264cf8abddba5dbfddc133 Mon Sep 17 00:00:00 2001
From: Rob Watson <rob@netflux.io>
Date: Tue, 2 Feb 2021 12:37:36 +0100
Subject: [PATCH] update vimrc and zshrc

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

diff --git a/vim/after/ftplugin/go.vim b/vim/after/ftplugin/go.vim
index 5ffeb7c..b0a7c44 100644
--- a/vim/after/ftplugin/go.vim
+++ b/vim/after/ftplugin/go.vim
@@ -42,6 +42,8 @@ iabbrev mk make([]MyType, 0)<esc>9h
 iabbrev wr w http.ResponseWriter, r *http.Request
 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 errf <esc>ccif err != nil {<cr>log.Fatal(err)<cr>}
-iabbrev errl <esc>ccif err != nil {<cr>fmt.Println(err)<cr>}
+iabbrev errP <esc>ccif err != nil {<cr>panic(err)<cr>}
+iabbrev errl <esc>ccif err != nil {<cr>log.Println(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
diff --git a/vimrc b/vimrc
index 32dac69..5418ed7 100644
--- a/vimrc
+++ b/vimrc
@@ -21,7 +21,7 @@ command! -nargs=0 -bar Helptags
 
 set shiftwidth=2
 set shiftround
-" set tabstop=8
+set tabstop=2
 set expandtab
 " set smarttab
 set splitbelow
@@ -172,6 +172,10 @@ nmap [h <Plug>(GitGutterPrevHunk)
 " Vim-Rust configuration:
 let g:rustfmt_autosave = 1
 
+" echodoc configuration:
+set cmdheight=2
+let g:echodoc#enable_at_startup = 1
+
 " ALE configuration:
 function SymbolSearch()
   call inputsave()
@@ -245,6 +249,7 @@ runtime macros/matchit.vim
 packadd! ale
 
 " load other plugins:
+packadd! echodoc.vim
 packadd! lightline.vim
 packadd! tmux-complete.vim
 packadd! vim-commentary
diff --git a/zshrc b/zshrc
index 3fd236e..53dbc4e 100644
--- a/zshrc
+++ b/zshrc
@@ -68,7 +68,7 @@ ZSH_THEME="gianu"
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git history-substring-search)
+plugins=(git history-substring-search docker docker-compose golang)
 
 source $ZSH/oh-my-zsh.sh
 
@@ -129,6 +129,7 @@ git config --global alias.br branch
 # Other aliases
 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 tkp="tmux kill-pane"
 alias tkw="tmux kill-window"