diff --git a/vim/after/ftplugin/go.vim b/vim/after/ftplugin/go.vim
index dc533fd..b0978df 100644
--- a/vim/after/ftplugin/go.vim
+++ b/vim/after/ftplugin/go.vim
@@ -51,13 +51,14 @@ 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'
-" ALE handles this:
+" ALE handles auto type info:
 let g:go_auto_type_info = 0
-let g:go_echo_command_info = 1
+let g:go_code_completion_enabled = 1
+let g:go_echo_command_info = 0
 let g:go_echo_go_info = 0
 let g:go_highlight_functions = 1
-let g:go_term_enabled = 0
-let g:go_term_close_on_exit = 0
+" g:go_statusline_duration doesn't seem to work accurately, but does help:
+let g:go_statusline_duration = 1000
 let g:go_gopls_analyses = {
       \ 'composites': v:false,
       \ 'unusedparams': v:true,
diff --git a/vimrc b/vimrc
index 330b5f5..19d70d7 100644
--- a/vimrc
+++ b/vimrc
@@ -168,7 +168,21 @@ nmap <leader>b :Buffers<cr>
 nmap <leader>gg :Rg<cr>
 
 " Lightline configuration:
+packadd! lightline.vim
 set laststatus=2
+let g:lightline = {
+      \ 'colorscheme': 'seoul256',
+      \ 'active': {
+      \   'left': [ [ 'mode', 'paste' ],
+      \             [ 'readonly', 'filename', 'modified' ],
+      \             [ 'gitbranch' ] ],
+      \   'right': [ ['lineinfo'], ['percent'], ['filetype'], ['gobuild'] ],
+      \ },
+      \ 'component_function': {
+      \   'gobuild': 'go#statusline#Show',
+      \   'gitbranch': 'FugitiveHead',
+      \ },
+\ }
 
 " vim-gitgutter configuration
 nnoremap hg :GitGutterLineHighlightsToggle<cr>
@@ -264,7 +278,6 @@ runtime macros/matchit.vim
 packadd! ale
 
 " load other plugins:
-packadd! lightline.vim
 packadd! tmux-complete.vim
 packadd! vim-commentary
 packadd! vim-gitgutter