From 131dbec7c907126e9e310deda19294a61d645158 Mon Sep 17 00:00:00 2001 From: "flyingscorpio@arch-desktop" Date: Wed, 24 Jun 2020 12:50:36 +0200 Subject: [PATCH] Regroup autocmds and throw some shit away --- dotfiles/vim/vimrc | 43 ++++--------------------------------------- 1 file changed, 4 insertions(+), 39 deletions(-) diff --git a/dotfiles/vim/vimrc b/dotfiles/vim/vimrc index cbe1e96..7289d28 100644 --- a/dotfiles/vim/vimrc +++ b/dotfiles/vim/vimrc @@ -149,13 +149,6 @@ augroup configgroup autocmd VimEnter * highlight clear SignColumn - " Automatically open NERDTree when vim starts up without files specified - autocmd StdinReadPre * let s:std_in=1 - autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif - - " Close vim if the only window left open is a NERDTree - autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif - " Run StripWhitespace function on write autocmd BufWritePre * :StripWhitespace " Run Flake8 on write in python files @@ -166,44 +159,16 @@ augroup configgroup autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber autocmd FileType c let g:ycm_extra_conf_globlist = ['~/*'] - autocmd FileType java setlocal noexpandtab - autocmd FileType java setlocal list - autocmd FileType java setlocal listchars=tab:+\ ,eol:- - autocmd FileType java setlocal formatprg=par\ -w80\ -T4 - autocmd FileType php setlocal expandtab - autocmd FileType php setlocal list - autocmd FileType php setlocal lischars=tab:+\ ,eol:- - autocmd FileType php setlocal formatprg=par\ -w80\ -T4 - autocmd FileType ruby setlocal tabstop=2 - autocmd FileType ruby setlocal shiftwidth=2 - autocmd FileType ruby setlocal softtabstop=2 - autocmd FileType ruby setlocal commentstring=#\ %s autocmd FileType rust nnoremap :RustFmt - autocmd FileType python setlocal commentstring=#\ %s - autocmd FileType python setlocal foldmethod=indent + autocmd FileType python nnoremap :Black + autocmd FileType html,htmldjango,python,yaml setlocal foldmethod=indent autocmd FileType python setlocal colorcolumn=80 autocmd FileType python let g:ycm_python_interpreter_path = '' autocmd FileType python let g:ycm_python_sys_path = [] autocmd FileType python let g:ycm_extra_conf_vim_data = ['g:ycm_python_interpreter_path', 'g:ycm_python_sys_path'] autocmd FileType python let g:ycm_global_ycm_extra_conf = '~/.global_extra_conf.py' - autocmd FileType python nnoremap :Black - autocmd FileType yaml setlocal foldmethod=indent - autocmd BufEnter *.cls setlocal filetype=java - autocmd BufEnter *zsh-theme setlocal filetype=zsh - autocmd BufEnter Makefile setlocal noexpandtab - autocmd BufEnter Makefile setlocal tabstop=6 - autocmd BufEnter Makefile setlocal shiftwidth=6 - autocmd BufEnter Makefile setlocal softtabstop=0 - autocmd BufEnter *.asm setlocal noexpandtab - autocmd BufEnter *.asm setlocal tabstop=6 - autocmd BufEnter *.asm setlocal shiftwidth=6 - autocmd BufEnter *.asm setlocal softtabstop=0 - autocmd BufEnter *.html setlocal foldmethod=indent - autocmd BufEnter *.sh setlocal tabstop=2 - autocmd BufEnter *.sh setlocal shiftwidth=2 - autocmd BufEnter *.sh setlocal softtabstop=2 - autocmd BufEnter *.sh setlocal foldmethod=marker - autocmd BufEnter *.sh setlocal foldlevel=0 + autocmd BufEnter Makefile,*.asm setlocal noexpandtab tabstop=6 shiftwidth=6 softtabstop=0 + autocmd BufEnter *.sh setlocal shiftwidth=2 tabstop=2 softtabstop=2 foldlevel=0 foldmethod=marker augroup END " }}}