diff --git a/.vimrc b/.vimrc index 9a9fc8f..4414486 100644 --- a/.vimrc +++ b/.vimrc @@ -133,15 +133,17 @@ " } - + " Formatting { "set nowrap " Do not wrap long lines set autoindent " Indent at the same level of the previous line - set shiftwidth=4 " Use indents of 4 spaces set expandtab " Tabs are spaces, not tabs + set shiftwidth=4 " Use indents of 4 spaces set tabstop=4 " An indentation every four columns set softtabstop=4 " Let backspace delete indent + autocmd FileType javascript,typescript set tabstop=2 shiftwidth=2 softtabstop=2 + autocmd FileType c,cpp,python,java set tabstop=4 shiftwidth=4 softtabstop=4 set nojoinspaces " Prevents inserting two spaces after punctuation on a join (J) set splitright " Puts new vsplit windows to the right of the current set splitbelow " Puts new split windows to the bottom of the current diff --git a/coc-nvim-config.vim b/coc-nvim-config.vim index 4c8916c..5609da5 100644 --- a/coc-nvim-config.vim +++ b/coc-nvim-config.vim @@ -2,8 +2,8 @@ " let g:coc_global_extensions = ['coc-pyright', 'coc-rls', 'coc-clangd', 'coc-tsserver', 'coc-html', 'coc-cmake', 'coc-json', 'coc-sh', 'coc-java'] let g:coc_global_extensions = ['coc-pyright', 'coc-tsserver'] -g:coc_data_home = g:vim_dir . '/coc' -g:coc_config_home = g:vim_dir . '/coc' +let g:coc_data_home = g:vim_dir . '/coc' +let g:coc_config_home = g:vim_dir . '/coc' " Use to trigger completion. if has('nvim')