diff --git a/vimrc b/vimrc index 0f7123d..181c464 100644 --- a/vimrc +++ b/vimrc @@ -15,7 +15,7 @@ set backupdir^=~/.vim/_backup// set cursorline set cursorcolumn set directory^=~/.vim/_temp// -set encoding=utf8 +set encoding=utf-8 set hlsearch set ignorecase set incsearch @@ -24,11 +24,12 @@ set linebreak set modeline set nowrap set number +set signcolumn=yes set smartcase set statusline+=%#warningmsg# set statusline+=%* set tabstop=4 -set updatetime=100 +set updatetime=300 set textwidth=1000 if has("persistent_undo") @@ -46,9 +47,11 @@ au BufRead,BufNewFile .envrc setfiletype sh au BufRead,BufNewFile Dockerfile* setfiletype dockerfile au BufRead,BufNewFile Pipfile setfiletype toml au BufRead,BufNewFile kubectl-edit-status-* setfiletype yaml +au BufRead,BufNewFile *kubeconfig* setfiletype yaml au BufRead,BufNewFile .lintr setfiletype yaml au BufRead,BufNewFile devcontainer.json setfiletype jsonc au BufRead,BufNewFile devcontainer-feature.json setfiletype jsonc +au BufRead,BufNewFile *.bicepparam setfiletype bicep au BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4 au FileType go nmap r (go-run) au FileType go nmap c (go-coverage-toggle) @@ -77,20 +80,21 @@ map l :Minimap map L :MinimapClose nmap :TagbarToggle -augroup black_on_save - autocmd! - autocmd BufWritePre *.py Black -augroup end +"augroup black_on_save +" autocmd! +" autocmd BufWritePre *.py Black +"augroup end autocmd BufNewFile,BufRead *.c set formatprg=astyle\ -t4\ -A14 let g:EditorConfig_exclude_patterns = ['fugitive://.*', 'scp://.*'] let g:airline_powerline_fonts = 1 +let g:black_use_virtualenv = 1 let g:coc_global_extensions = ['coc-tsserver'] let g:coc_node_path = "/home/dan/.nvm/versions/node/v16.9.1/bin/node" let g:go_auto_sameids = 1 let g:go_auto_type_info = 1 -let g:go_def_mode='gopls' +let g:go_def_mode = 'gopls' let g:go_fmt_command = "goimports" let g:go_highlight_build_constraints = 1 let g:go_highlight_extra_types = 1 @@ -98,7 +102,7 @@ let g:go_highlight_fields = 1 let g:go_highlight_function_calls = 1 let g:go_highlight_functions = 1 let g:go_highlight_operators = 1 -let g:go_info_mode='gopls' +let g:go_info_mode = 'gopls' let g:html_indent_script1 = "inc" let g:html_indent_style1 = "inc" let g:minimap_auto_start = 1 @@ -108,6 +112,7 @@ let g:minimap_highlight_search = 1 let g:minimap_enable_highlight_colorgroup = 1 let g:minimap_width = 10 let g:python_highlight_all = 1 +let g:rehash256 = 1 let g:rustfmt_autosave = 1 let g:shfmt_extra_args = '-i 2' let g:shfmt_fmt_on_save = 1 @@ -117,7 +122,16 @@ let g:vim_markdown_folding_disabled = 1 let g:vim_markdown_frontmatter = 1 let g:yapf_style = "pep8" -colorscheme dracula + +if exists('+termguicolors') + let &t_8f = "\[38;2;%lu;%lu;%lum" + let &t_8b = "\[48;2;%lu;%lu;%lum" + set termguicolors +endif + +"colorscheme dichromatic +"colorscheme darcula +colorscheme molokai hi Comment cterm=NONE ctermfg=DarkRed gui=NONE guifg=red2 hi minimapCursor ctermbg=59 ctermfg=228 guibg=#5F5F5F guifg=#FFFF87 @@ -131,16 +145,4 @@ function! SynStack() echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")') endfunc -" use to trigger completion and navigate to the next complete item -function! CheckBackspace() abort - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~# '\s' -endfunction - -inoremap - \ coc#pum#visible() ? coc#pum#next(1) : - \ CheckBackspace() ? "\" : - \ coc#refresh() - -inoremap coc#pum#visible() ? coc#pum#next(1) : "\" -inoremap coc#pum#visible() ? coc#pum#prev(1) : "\" +source ~/.vimrc.coc