diff --git a/.vim/coc-settings.json b/.vim/coc-settings.json
index 427e9b0..afd24cd 100644
--- a/.vim/coc-settings.json
+++ b/.vim/coc-settings.json
@@ -15,6 +15,11 @@
              "directory": ".ccls-cache"
            }
          }
+    },
+		"golang": {
+      "command": "gopls",
+      "rootPatterns": ["go.mod", ".vim/", ".git/", ".hg/"],
+      "filetypes": ["go"]
     }
   }
 }
diff --git a/.vimrc b/.vimrc
index bd4c271..a0f0390 100644
--- a/.vimrc
+++ b/.vimrc
@@ -441,8 +441,9 @@ let g:ctrlp_match_window = 'bottom,order:ttb,min:1,max:15'
 let g:go_fmt_command = "goimports"
 "let g:go_auto_type_info = 1
 let g:go_updatetime = 300
-"let g:go_bin_path = "$HOME/.go/bin"
-let g:go_def_mode = 'guru'
+let g:go_bin_path = $HOME . "/.go/bin"
+"let g:go_def_mode = 'gopls'
+"let g:go_info_mode = 'gopls'
 
 " ** STATUSLINE **
 set laststatus=2