diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index ba29039..f92789d 100755
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -151,6 +151,7 @@ let g:go_highlight_variable_assignments = 1
 let g:go_highlight_variable_declarations = 1
 let g:go_metalinter_autosave=1
 let g:go_metalinter_autosave_enabled=['golint', 'govet']
+let g:go_rename_command = 'gopls'
 
 " vim-terraform
 let g:terraform_align=1
diff --git a/.zshrc b/.zshrc
index 93eb702..c79eab8 100644
--- a/.zshrc
+++ b/.zshrc
@@ -6,7 +6,6 @@ plugins=(fzf git zsh-syntax-highlighting last-working-dir zsh-autosuggestions)
 CASE_SENSITIVE="true"
 
 ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#838383,underline"
-ZSH_AUTOSUGGEST_STRATEGY=(history completion)
 
 # Disable marking untracked files
 # under VCS as dirty. This makes repository status check for large repositories