diff --git a/files/vim/.vim/autocmds.vim b/files/vim/.vim/autocmds.vim index 8ca55c1..5c3c5d1 100644 --- a/files/vim/.vim/autocmds.vim +++ b/files/vim/.vim/autocmds.vim @@ -1,5 +1,23 @@ if has("autocmd") - "filetype functions + "global autocmds + "----------------- + augroup global + autocmd! + "keep equal proportions when windows resized + autocmd VimResized * wincmd = + "save cursor position in a file + autocmd BufReadPost * if line("'\"") > 1 && line("'\"") + \ <= line("$") | exe "normal! g'\"" | endif + augroup END + + "general filetype autocmds + "------------------------- + augroup emmet_group + autocmd! + autocmd BufNewFile,BufRead *html*,*css*,*js* EmmetInstall + augroup END + + "language specific filetype functions (run by autocmds) "------------------ function FT_python() setlocal autoindent @@ -11,11 +29,13 @@ if has("autocmd") endfunction function FT_ruby() - setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab + setlocal autoindent + setlocal formatprg=rubocop endfunction function FT_go() set noexpandtab + setlocal formatprg=gofmt let g:go_auto_type_info = 1 let g:go_imports_autosave = 1 endfunction @@ -32,42 +52,6 @@ if has("autocmd") setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab endfunction - "global autocmds - "----------------- - augroup global - autocmd! - "keep equal proportions when windows resized - autocmd VimResized * wincmd = - "save cursor position in a file - autocmd BufReadPost * if line("'\"") > 1 && line("'\"") - \ <= line("$") | exe "normal! g'\"" | endif - augroup END - - "general filetype autocmds - "------------------------- - augroup emmet_group - autocmd! - autocmd FileType html,css EmmetInstall - augroup END - - augroup prettier_format_group - autocmd! - autocmd FileType javascript setlocal formatprg=prettier - autocmd FileType typescript setlocal formatprg=prettier\ --parser\ typescript - autocmd FileType vue setlocal formatprg=prettier\ --parser\ vue - autocmd FileType html setlocal formatprg=prettier\ --parser\ html - autocmd FileType css setlocal formatprg=prettier\ --parser\ css - autocmd FileType scss setlocal formatprg=prettier\ --parser\ scss - autocmd FileType markdown setlocal formatprg=prettier\ --parser\ markdown - autocmd FileType json setlocal formatprg=prettier\ --parser\ json - autocmd FileType yaml setlocal formatprg=prettier\ --parser\ yaml - augroup END - - augroup halftab_indent_group - autocmd! - autocmd FileType sh,bash,html,css,scss,javascript,json,toml,yaml call FT_halftab() - augroup END - "language specific autocmds "-------------------------- augroup language_group @@ -76,5 +60,6 @@ if has("autocmd") autocmd FileType go call FT_go() autocmd FileType html call FT_html() autocmd FileType markdown call FT_markdown() + autocmd FileType sh,ruby,bash,html,css,scss,javascript,json,toml,yaml call FT_halftab() augroup END endif diff --git a/files/vim/.vim/keybinds.vim b/files/vim/.vim/keybinds.vim index 404aaae..33ac0e2 100644 --- a/files/vim/.vim/keybinds.vim +++ b/files/vim/.vim/keybinds.vim @@ -64,7 +64,7 @@ nmap agd (ale_go_to_definition) nmap agd (ale_go_to_definition) "vim-emmet -let g:user_emmet_leader_key = ',' +let g:user_emmet_leader_key = '' "git-gutter nnoremap ggt :GitGutterToggle diff --git a/files/vim/.vim/plugins.vim b/files/vim/.vim/plugins.vim index cac57dd..8a66ed4 100644 --- a/files/vim/.vim/plugins.vim +++ b/files/vim/.vim/plugins.vim @@ -105,6 +105,3 @@ let g:vim_markdown_folding_disabled = 1 let g:vim_markdown_toc_autofit = 1 let g:vim_markdown_conceal = 0 let g:vim_markdown_frontmatter = 1 - -"vim-emmet -let g:user_emmet_install_global = 1 diff --git a/files/vim/.vim/vimrc b/files/vim/.vim/vimrc index 4dd84d5..ce2f26e 100644 --- a/files/vim/.vim/vimrc +++ b/files/vim/.vim/vimrc @@ -8,8 +8,8 @@ source ~/.vim/functions.vim source ~/.vim/commands.vim source ~/.vim/keybinds.vim source ~/.vim/plugins.vim -source ~/.vim/colorschemes.vim source ~/.vim/autocmds.vim +source ~/.vim/colorschemes.vim if filereadable(expand("~/.config/vimrc")) source ~/.config/vimrc