update

1 files changed, 129 insertions, 129 deletions

diff --git a/.vimrc b/.vimrc
index 0a41fde..4986bcb 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,123 +1,123 @@
-	" General vim defaults
-	" set background=
-	" set t_te= t_ti=
-	set ls=1 ruler
-	set ai ts=4 sw=4 noet
-	" Not a good idea to activate mouse, as it disables cut & paste in MacOS
-	"set mouse=a
-	syntax off
-	filetype on
-	filetype plugin on
-	filetype plugin indent on
-	let mapleader = ","
-
-	" Save all files at the same place
-	set backupdir=~/.vim/backup//
-	set directory=~/.vim/backup//
-	set undodir=~/.vim/backup//
-	set undofile
-	set backup
-
-	set autochdir
-
-	" No bell
-	set belloff=all
-
-	set guifont=6x13:h13
-
-	set rtp+=/opt/homebrew/opt/fzf
-	let g:fzf_preview = 'cat {}'
-
-	set grepprg=rg\ --vimgrep\ --smart-case\ --hidden\ --follow
-
-	nnoremap \ :Rg<CR>
-	nnoremap <C-T> :Files<cr>
-	nnoremap <Leader>b :Buffers<cr>
-	nnoremap <Leader>s :Blines<cr>
-
-	" vimki plugin
-	autocmd filetype vimki syntax on
-	autocmd filetype vimki set autowrite
-	" autocmd filetype vimki setlocal spell spelllang=fr
-	autocmd filetype vimki nmap <leader>z :FZF ~/Wiki<CR>
-	autocmd filetype markdown,text,vimki setlocal textwidth=72
-
-	" 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 = "gopls"
-	let g:go_gopls_gofumpt = 1
-
-	" let g:go_gopls_enabled = 0
-	let g:go_gopls_enabled = 1
-	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)
-	autocmd FileType go nmap <leader>i <Plug>(go-info)
-	autocmd FileType go nmap <leader>r <Plug>(go-run)
-	autocmd FileType go nmap <leader>t <Plug>(go-test)
-	autocmd FileType go nmap <leader>f <Plug>(go-test-func)
-	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
-
-	let g:netrw_browsex_viewer = "open"
-	let g:netrw_gx = "<cWORD>"
-	let g:netrw_banner = 0
-
-	" python and yaml formatting:
-	autocmd filetype python,yaml set ts=2 sts=2 sw=2 et
-
-	:set wrap
-	:set linebreak
-	:set nolist
-	:set formatoptions-=t
-	" noremap <M-v> :!cscope -1 <cword>


-	" noremap <M-a> :!cscope -0 <cword>


-	" noremap <M-f> :!cscope -7 <cfile>


-
-	" Paragraph format / unformat
-	" An alternate way is to use "gqip" to format.
-	" noremap <leader>f !}fmt -72 -s -p

-	" noremap <leader>F !}fmt -c -w 2048

-	noremap <leader>f gqip
-
-	" noremap <buffer> K :s,^,//,

-	" noremap <buffer> <C-K> :s,^//,,

-	" noremap <buffer> # :s,^,#,

-	" noremap <buffer> @ :s,^#,,

-	"hi MatchParen term=reverse ctermbg=magenta ctermfg=none
-	" hi MatchParen cterm=reverse term=reverse ctermfg=white
-	"
-
-	" Fix spell highlighting
-	hi clear SpellBad
-	hi SpellBad cterm=underline
-	hi SpellBad gui=undercurl
-
-	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>
+" General vim defaults
+" set background=
+" set t_te= t_ti=
+set ls=1 ruler
+set ai ts=4 sw=4 noet
+" Not a good idea to activate mouse, as it disables cut & paste in MacOS
+"set mouse=a
+syntax off
+filetype on
+filetype plugin on
+filetype plugin indent on
+let mapleader = ","
+
+" Save all files at the same place
+set backupdir=~/.vim/backup//
+set directory=~/.vim/backup//
+set undodir=~/.vim/backup//
+set undofile
+set backup
+
+set autochdir
+
+" No bell
+set belloff=all
+
+set guifont=6x13:h13
+
+set rtp+=/opt/homebrew/opt/fzf
+let g:fzf_preview = 'cat {}'
+
+set grepprg=rg\ --vimgrep\ --smart-case\ --hidden\ --follow
+
+nnoremap \ :Rg<CR>
+" nnoremap <C-T> :Files<cr>
+nnoremap <Leader>b :Buffers<cr>
+nnoremap <Leader>s :Blines<cr>
+
+" vimki plugin
+autocmd filetype vimki syntax on
+autocmd filetype vimki set autowrite
+" autocmd filetype vimki setlocal spell spelllang=fr
+autocmd filetype vimki nmap <leader>z :FZF ~/Wiki<CR>
+autocmd filetype markdown,text,vimki setlocal textwidth=72
+
+" 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 = "gopls"
+let g:go_gopls_gofumpt = 1
+
+" let g:go_gopls_enabled = 0
+let g:go_gopls_enabled = 1
+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)
+autocmd FileType go nmap <leader>i <Plug>(go-info)
+autocmd FileType go nmap <leader>r <Plug>(go-run)
+autocmd FileType go nmap <leader>t <Plug>(go-test)
+autocmd FileType go nmap <leader>f <Plug>(go-test-func)
+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
+
+let g:netrw_browsex_viewer = "open"
+let g:netrw_gx = "<cWORD>"
+let g:netrw_banner = 0
+
+" python and yaml formatting:
+autocmd filetype python,yaml set ts=2 sts=2 sw=2 et
+
+:set wrap
+:set linebreak
+:set nolist
+:set formatoptions-=t
+" noremap <M-v> :!cscope -1 <cword>


+" noremap <M-a> :!cscope -0 <cword>


+" noremap <M-f> :!cscope -7 <cfile>


+
+" Paragraph format / unformat
+" An alternate way is to use "gqip" to format.
+" noremap <leader>f !}fmt -72 -s -p

+" noremap <leader>F !}fmt -c -w 2048

+noremap <leader>f gqip
+
+" noremap <buffer> K :s,^,//,

+" noremap <buffer> <C-K> :s,^//,,

+" noremap <buffer> # :s,^,#,

+" noremap <buffer> @ :s,^#,,

+"hi MatchParen term=reverse ctermbg=magenta ctermfg=none
+" hi MatchParen cterm=reverse term=reverse ctermfg=white
+"
+
+" Fix spell highlighting
+hi clear SpellBad
+hi SpellBad cterm=underline
+hi SpellBad gui=undercurl
+
+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>
 
 """"""""""""" My cscope/vim key mappings
-    "
-    " The following maps all invoke one of the following cscope search types:
-    "
-    "   's'   symbol: find all references to the token under cursor
-    "   'g'   global: find global definition(s) of the token under cursor
-    "   'c'   calls:  find all calls to the function name under cursor
-    "   't'   text:   find all instances of the text under cursor
-    "   'e'   egrep:  egrep search for the word under cursor
-    "   'f'   file:   open the filename under cursor
-    "   'i'   includes: find files that include the filename under cursor
-    "   'd'   called: find functions that function under cursor calls
+"
+" The following maps all invoke one of the following cscope search types:
+"
+"   's'   symbol: find all references to the token under cursor
+"   'g'   global: find global definition(s) of the token under cursor
+"   'c'   calls:  find all calls to the function name under cursor
+"   't'   text:   find all instances of the text under cursor
+"   'e'   egrep:  egrep search for the word under cursor
+"   'f'   file:   open the filename under cursor
+"   'i'   includes: find files that include the filename under cursor
+"   'd'   called: find functions that function under cursor calls
 
 noremap <leader>s :cs find s <C-R>=expand("<cword>")<CR><CR><tab>
 noremap <leader>g :cs find g <C-R>=expand("<cword>")<CR><CR><tab>
@@ -129,17 +129,17 @@ noremap <leader>i :cs find i <C-R>=expand("<cfile>")<CR><CR><tab>
 noremap <leader>d :cs find d <C-R>=expand("<cword>")<CR><CR><tab>
 
 function! CloseOnLast()
- 	let cnt = 0
- 	for i in range(0, bufnr("$"))
- 	if buflisted(i)
- 			let cnt += 1
- 		endif
- 	endfor
-     if cnt <= 1
- 		q
- 	else
- 		bd
- 	endif
- endfunction
+let cnt = 0
+for i in range(0, bufnr("$"))
+if buflisted(i)
+		let cnt += 1
+	endif
+endfor
+ if cnt <= 1
+	q
+else
+	bd
+endif
+endfunction
 
 noremap <leader><leader> :call CloseOnLast()<cr>