From 956bff6a989d387e0c8ed294f0c20d014275afb6 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Wed, 6 Mar 2024 16:27:56 -0500 Subject: [PATCH] Don't rotate vimdiff panes, move the vim_json_syntax_conceal to a config file attached to the plugin it affects, set a max width for text filetypes, and improve the comments in after.vim --- vim/config/after.vim | 10 +++------- vim/config/plugins/vim-polyglot-darkcloud.vim | 2 ++ 2 files changed, 5 insertions(+), 7 deletions(-) create mode 100644 vim/config/plugins/vim-polyglot-darkcloud.vim diff --git a/vim/config/after.vim b/vim/config/after.vim index f9e33de..2d0c9d3 100644 --- a/vim/config/after.vim +++ b/vim/config/after.vim @@ -35,10 +35,7 @@ autocmd FileChangedRO * nested set noreadonly "enable more accurate syntax synchronization autocmd BufEnter * :syntax sync fromstart - "don't conceal json syntax - let g:vim_json_syntax_conceal = 0 - - "set given filenames to various filetypes + "set filetypes for various file extensions autocmd BufNewFile,BufRead *.aspx,*.asmx,*.ascx,*.master setlocal ft=aspnet autocmd BufNewFile,BufRead *.gradle setlocal ft=groovy autocmd BufNewFile,BufRead *eslintrc setlocal ft=json @@ -49,7 +46,7 @@ autocmd FileChangedRO * nested set noreadonly "filtype specific settings autocmd BufEnter,FileType sh setlocal iskeyword-=. - autocmd Filetype text,markdown,gitcommit,mail setlocal nonumber spell nolist linebreak tabstop=2 shiftwidth=2 breakat&vim breakat-=* breakat-=. breakat-=/ breakat-=? breakat-=, breakat-=: breakat-=; breakat-=! "set some defaults for word processing + autocmd Filetype text,markdown,gitcommit,mail setlocal nonumber spell nolist linebreak textwidth=80 tabstop=2 shiftwidth=2 breakat&vim breakat-=* breakat-=. breakat-=/ breakat-=? breakat-=, breakat-=: breakat-=; breakat-=! "set some defaults for word processing autocmd Filetype text,gitcommit,mail setlocal wrap autocmd FileType tmux setlocal commentstring=#\ %s "set the comment string to # autocmd FileType scss setlocal iskeyword+=$ @@ -65,9 +62,8 @@ autocmd FileChangedRO * nested set noreadonly "settings for buffers in diff mode autocmd VimEnter,FilterWritePre * if &diff|setlocal nofoldenable|endif - autocmd VimEnter * if &diff|wincmd H|endif - "disable the whitespace plugin for vimfiler + "disable the whitespace plugin for vimfiler and the mail filetype autocmd BufEnter,FileType vimfiler,mail hi ExtraWhitespace ctermbg=NONE guibg=NONE "vimpager settings diff --git a/vim/config/plugins/vim-polyglot-darkcloud.vim b/vim/config/plugins/vim-polyglot-darkcloud.vim new file mode 100644 index 0000000..be4e1c0 --- /dev/null +++ b/vim/config/plugins/vim-polyglot-darkcloud.vim @@ -0,0 +1,2 @@ +"don't conceal json syntax +let g:vim_json_syntax_conceal = 0