diff --git a/vim/after/ftplugin/go.vim b/vim/after/ftplugin/go.vim index 7822013..41385d1 100644 --- a/vim/after/ftplugin/go.vim +++ b/vim/after/ftplugin/go.vim @@ -22,9 +22,13 @@ let g:go_imports_autosave = 1 let g:go_auto_sameids = 0 let g:go_auto_type_info = 0 let g:go_info_mode = "gopls" +let g:go_highlight_functions = 1 +let g:go_term_enabled = 0 +let g:go_term_close_on_exit = 0 let g:go_fmt_options = { \ 'goimports': '-local github.com/sensiblecode.com/cantabular', \ } + autocmd BufNewFile,BufRead *.gohtml set syntax=gohtmltmpl autocmd BufNewFile,BufRead *.go nmap g6 :GoAlternate! diff --git a/vimrc b/vimrc index 4fcd40e..d956e64 100644 --- a/vimrc +++ b/vimrc @@ -56,6 +56,7 @@ set balloonevalterm set scrolloff=5 set dict=/usr/share/dict/words set shortmess+=I +set updatetime=100 set pastetoggle= " See :help thesaurus set thesaurus=$HOME/Documents/thesaurus/thesaurus_pkg/thesaurus.txt @@ -64,7 +65,7 @@ set completeopt=menu,menuone,popup,longest,noselect set completepopup=width:300,height:50,align:item,border:off " Colour scheme: -colorscheme iceberg +colorscheme nord " Automatically load/save views on files. " https://vi.stackexchange.com/posts/13874/revisions @@ -85,7 +86,7 @@ imap imap imap -nnoremap ,/ :nohlsearch +nnoremap ,/ :nohlsearch map :tabnew " Select just-pasted text: nnoremap 0 `[v`] @@ -151,6 +152,11 @@ packadd! command-t " Lightline configuration: set laststatus=2 +" vim-gitgutter configuration +nnoremap hg :GitGutterLineHighlightsToggle +nmap ]h (GitGutterNextHunk) +nmap [h (GitGutterPrevHunk) + " Vim-Rust configuration: let g:rustfmt_autosave = 1 @@ -232,5 +238,6 @@ packadd! ale packadd! lightline.vim packadd! tmux-complete.vim packadd! vim-commentary +packadd! vim-gitgutter packadd! vim-surround packadd! vim-yaml-folds