From 6258df971a00f175cd434e7874c6ba5616b50e60 Mon Sep 17 00:00:00 2001
From: Marc Vertes <mvertes@free.fr>
Date: Sat, 18 Dec 2021 11:37:10 +0100
Subject: update

---
 .vimrc | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

(limited to '.vimrc')

diff --git a/.vimrc b/.vimrc
index 1380fe8..8972385 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,14 +1,14 @@
+" General vim defaults
 " set background=
-"set t_te= t_ti= laststatus=2
 set t_te= t_ti= ls=1 ruler
-
+set ai ts=4 sw=4 noet
 syntax off
 filetype on
 filetype plugin on
 filetype plugin indent on
 let mapleader = ","
 
-" set rtp+=/opt/homebrew/opt/fzf
+"set rtp+=/opt/homebrew/opt/fzf
 let g:fzf_preview = 'cat {}'
 
 " vimki plugin
@@ -18,14 +18,17 @@ 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 syntax on
 autocmd FileType go nmap <leader>b <Plug>(go-build)
 autocmd FileType go nmap <leader>i <Plug>(go-info)
 autocmd FileType go nmap <leader>r <Plug>(go-run)
@@ -35,21 +38,15 @@ autocmd FileType go nmap <leader>v <Plug>(go-referrers)
 autocmd FileType go nmap <leader>n :cnext<CR>
 autocmd FileType go nmap <leader>p :cprevious<CR>
 autocmd FileType go nmap <leader>a :cclose<CR>
-autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4
+" autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4
 
 let g:netrw_browsex_viewer = "open"
 let g:netrw_gx = "<cWORD>"
 let g:netrw_banner = 0
 
-autocmd filetype javascript,html,json,yaml set ts=2 sts=2 sw=2 et
+" python and yaml formatting:
+autocmd filetype python,yaml set ts=2 sts=2 sw=2 et
 
-" :set wm=2 linebreak
-" :set term=ansi
-":set modeline
-":set modelines=5
-set autoindent
-"set breakindent
-" :set ts=2 sw=2 sts=2 et
 :set wrap
 :set linebreak
 :set nolist
@@ -79,3 +76,4 @@ noremap <leader>n :bn<cr>
 noremap <leader><leader> :bd<cr>
 noremap <leader>o :!open <cWORD>&<cr><cr>
 noremap  <C-g> :tag <c-r><c-w><cr>
+noremap <C-p> :Files<cr>
-- 
cgit v1.2.3