summaryrefslogtreecommitdiff
path: root/.vimrc
diff options
context:
space:
mode:
Diffstat (limited to '.vimrc')
-rw-r--r--.vimrc124
1 files changed, 66 insertions, 58 deletions
diff --git a/.vimrc b/.vimrc
index 3f29700..96983d3 100644
--- a/.vimrc
+++ b/.vimrc
@@ -93,7 +93,7 @@ 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-g> :tag <c-r><c-w><cr>
noremap <C-p> :Files<cr>
noremap <leader>e :cn<cr> " go to quickfix next error
@@ -123,62 +123,69 @@ endfunction
noremap <leader><leader> :call CloseOnLast()<cr>
-" vim-lsp settings
-let g:lsp_diagnostics_enabled = 0
-let g:lsp_document_code_action_signs_enabled = 0
-let g:lsp_document_highlight_enabled = 0
-"let g:lsp_log_verbose = 1
-"let g:lsp_log_file = expand('~/vim-lsp.log')
-
-if executable('gopls')
- au User lsp_setup call lsp#register_server({
- \ 'name': 'gopls',
- \ 'cmd': {server_info->['gopls', '-remote=auto']},
- \ 'allowlist': ['go', 'gomod', 'gohtmltmpl', 'gotexttmpl'],
- \ })
- autocmd BufWritePre *.go
- \ call execute('LspDocumentFormatSync') |
- \ call execute('LspCodeActionSync source.organizeImports')
-endif
-
-if executable('gnopls')
- au User lsp_setup call lsp#register_server({
- \ 'name': 'gnopls',
- \ 'cmd': {server_info->['gnopls']},
- \ 'allowlist': ['gno'],
- \ })
- autocmd BufWritePre *.gno
- \ call execute('LspDocumentFormatSync') |
- \ call execute('LspCodeActionSync source.organizeImports')
-endif
-
-if executable('clangd')
- au User lsp_setup call lsp#register_server({
- \ 'name': 'clangd',
- \ 'cmd': {server_info->['clangd', '-background-index']},
- \ 'whitelist': ['c', 'cpp', 'objc', 'objcpp'],
- \ })
-endif
-
-function! s:on_lsp_buffer_enabled() abort
- setlocal omnifunc=lsp#complete
- if exists('+tagfunc') | setlocal tagfunc=lsp#tagfunc | endif
- nmap <buffer> gd <plug>(lsp-definition)
- nmap <buffer> gs <plug>(lsp-document-symbol-search)
- nmap <buffer> gS <plug>(lsp-workspace-symbol-search)
- nmap <buffer> gr <plug>(lsp-references)
- nmap <buffer> gi <plug>(lsp-implementation)
- nmap <buffer> gy <plug>(lsp-type-definition)
- nmap <buffer> <leader>rn <plug>(lsp-rename)
- nmap <buffer> [g <plug>(lsp-previous-diagnostic)
- nmap <buffer> ]g <plug>(lsp-next-diagnostic)
- nmap <buffer> K <plug>(lsp-hover)
-endfunction
-
-augroup lsp_install
- au!
- autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled()
-augroup END
+" vim-go settings
+let g:go_gopls_enabled = 0
+let g:go_def_mode = 'godef'
+let g:go_fmt_command = 'goimports'
+let g:go_imports_mode = 'goimports'
+let g:go_rename_command = 'gorename'
+
+" " vim-lsp settings
+" let g:lsp_diagnostics_enabled = 0
+" let g:lsp_document_code_action_signs_enabled = 0
+" let g:lsp_document_highlight_enabled = 0
+" "let g:lsp_log_verbose = 1
+" "let g:lsp_log_file = expand('~/vim-lsp.log')
+"
+" if executable('gopls')
+" au User lsp_setup call lsp#register_server({
+" \ 'name': 'gopls',
+" \ 'cmd': {server_info->['gopls', '-remote=auto']},
+" \ 'allowlist': ['go', 'gomod', 'gohtmltmpl', 'gotexttmpl'],
+" \ })
+" autocmd BufWritePre *.go
+" \ call execute('LspDocumentFormatSync') |
+" \ call execute('LspCodeActionSync source.organizeImports')
+" endif
+"
+" if executable('gnopls')
+" au User lsp_setup call lsp#register_server({
+" \ 'name': 'gnopls',
+" \ 'cmd': {server_info->['gnopls']},
+" \ 'allowlist': ['gno'],
+" \ })
+" autocmd BufWritePre *.gno
+" \ call execute('LspDocumentFormatSync') |
+" \ call execute('LspCodeActionSync source.organizeImports')
+" endif
+"
+" if executable('clangd')
+" au User lsp_setup call lsp#register_server({
+" \ 'name': 'clangd',
+" \ 'cmd': {server_info->['clangd', '-background-index']},
+" \ 'whitelist': ['c', 'cpp', 'objc', 'objcpp'],
+" \ })
+" endif
+"
+" function! s:on_lsp_buffer_enabled() abort
+" setlocal omnifunc=lsp#complete
+" if exists('+tagfunc') | setlocal tagfunc=lsp#tagfunc | endif
+" nmap <buffer> gd <plug>(lsp-definition)
+" nmap <buffer> gs <plug>(lsp-document-symbol-search)
+" nmap <buffer> gS <plug>(lsp-workspace-symbol-search)
+" nmap <buffer> gr <plug>(lsp-references)
+" nmap <buffer> gi <plug>(lsp-implementation)
+" nmap <buffer> gy <plug>(lsp-type-definition)
+" nmap <buffer> <leader>rn <plug>(lsp-rename)
+" nmap <buffer> [g <plug>(lsp-previous-diagnostic)
+" nmap <buffer> ]g <plug>(lsp-next-diagnostic)
+" nmap <buffer> K <plug>(lsp-hover)
+" endfunction
+"
+" augroup lsp_install
+" au!
+" autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled()
+" augroup END
" Git blame
command! Blame normal!:let @a=expand('%')<CR>:let @b=line('.')<CR>:new<CR>:set bt=nofile<CR>:%!git blame -wM --date=short <C-R>a<CR>:<C-R>b<CR>
@@ -186,4 +193,5 @@ command! Blame normal!:let @a=expand('%')<CR>:let @b=line('.')<CR>:new<CR>:set b
" edit current word as file
noremap ge :e <cWORD>
" create a tag entry for current filename
-noremap gt :!echo "% % 1" >> tags; sort -o tags -Vu tags
+" noremap gt :!echo "% % 1" >> tags; LC_ALL=C sort -o tags -u tags
+noremap <leader>t :!echo "% % 1" >> tags; LC_ALL=C sort -o tags -u tags