disable gopls, revert to vim

2 files changed, 11 insertions, 8 deletions

diff --git a/.bashrc b/.bashrc
index 1a05028..8e0b339 100644
--- a/.bashrc
+++ b/.bashrc
@@ -49,8 +49,8 @@ alias timer='echo "Timer started. Stop with Ctrl-D." && date && time cat && date
 #alias ls='ls --color=auto -v'
 alias ls='ls -GF'
 alias ll='ls -AlGFhv'
-alias vi='nvim'
-alias view='nvim -R'
+alias vi='vim'
+alias view='vim -R'
 alias ldd='otool -L'
 alias ibrew='arch -x86_64 /usr/local/bin/brew'
 #alias op='xdg-open'
diff --git a/.vimrc b/.vimrc
index 092b7a1..f002a86 100644
--- a/.vimrc
+++ b/.vimrc
@@ -18,12 +18,15 @@ autocmd filetype vimki set autowrite
 autocmd filetype vimki nmap <leader>z :FZF ~/Wiki<CR>
 
 " vim-go plugin
-let g:go_def_mode = "gopls"
-let g:go_info_mode = "gopls"
-let g:go_list_type = "quickfix"
-" let g:go_fmt_command = "goimports"
-let g:go_fmt_command = "gopls"
-let g:go_gopls_gofumpt = 1
+"let g:go_def_mode = "gopls"
+"let g:go_info_mode = "gopls"
+"let g:go_list_type = "quickfix"
+"let g:go_fmt_command = "gopls"
+"let g:go_gopls_gofumpt = 1
+
+let g:go_gopls_enabled = 0
+let g:go_def_mode = "godef"
+let g:go_fmt_command = "goimports"
 let g:go_metalinter_command = "golangci-lint"
 "autocmd FileType go syntax on
 autocmd FileType go nmap <leader>b <Plug>(go-build)