From f50bbe77ab3b64f938defdea7e7613ac577ceb20 Mon Sep 17 00:00:00 2001 From: mxmehl Date: Sun, 25 Apr 2021 22:04:51 +0200 Subject: [PATCH] split vim config --- vim/.gitignore | 2 +- vim/.vim/_formatting.vim | 5 ++++ vim/.vim/_gvim-style.vim | 3 ++ vim/.vim/_line-shortcuts.vim | 11 ++++++++ vim/.vim/_spellcheck.vim | 22 +++++++++++++++ vim/.vim/_word-shortcuts.vim | 18 ++++++++++++ vim/.vim/advanced.vim | 19 ++----------- vim/.vim/astroid.vim | 3 ++ vim/.vim/mail.vim | 55 ++++-------------------------------- vim/.vimrc | 6 ---- 10 files changed, 71 insertions(+), 73 deletions(-) create mode 100644 vim/.vim/_formatting.vim create mode 100644 vim/.vim/_gvim-style.vim create mode 100644 vim/.vim/_line-shortcuts.vim create mode 100644 vim/.vim/_spellcheck.vim create mode 100644 vim/.vim/_word-shortcuts.vim diff --git a/vim/.gitignore b/vim/.gitignore index ea8d1cf..e833f8d 100644 --- a/vim/.gitignore +++ b/vim/.gitignore @@ -1,3 +1,3 @@ .vim/spell/*.add .vim/spell/*.spl -.vim/addresses.vim +.vim/_email-addresses.vim diff --git a/vim/.vim/_formatting.vim b/vim/.vim/_formatting.vim new file mode 100644 index 0000000..240724e --- /dev/null +++ b/vim/.vim/_formatting.vim @@ -0,0 +1,5 @@ +" Text width, comment format, indenting, formatoptions +set tw=72 " text width for line-break +set comments=s1:/mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-,fb:* +set ai! " auto indent +set fo+=tcqn " format options diff --git a/vim/.vim/_gvim-style.vim b/vim/.vim/_gvim-style.vim new file mode 100644 index 0000000..eddf207 --- /dev/null +++ b/vim/.vim/_gvim-style.vim @@ -0,0 +1,3 @@ + " hide gvim elements +set guioptions-=m "remove menu bar +set guioptions-=T "remove toolbar diff --git a/vim/.vim/_line-shortcuts.vim b/vim/.vim/_line-shortcuts.vim new file mode 100644 index 0000000..2abf317 --- /dev/null +++ b/vim/.vim/_line-shortcuts.vim @@ -0,0 +1,11 @@ +" delete lines until end +nmap dG1o +map! dG1o + +" delete current line +nmap ddi +map! ddi + +" add empty line +nmap 1o +map! 1o diff --git a/vim/.vim/_spellcheck.vim b/vim/.vim/_spellcheck.vim new file mode 100644 index 0000000..5fbc74a --- /dev/null +++ b/vim/.vim/_spellcheck.vim @@ -0,0 +1,22 @@ +setlocal spell spelllang=en_gb " default: EN spellcheck + +" Disable spell check +nmap :setlocal spell! +map! :setlocal spell!li + +" EN spell check +nmap :setlocal spell spelllang=en_gb +map! :setlocal spell spelllang=en_gbli + +" DE spell check +nmap :setlocal spell spelllang=de_20 +map! :setlocal spell spelllang=de_20li + +" highlight CApital LEtter TYpos +:match Title /\<\u\{2}\l.\{-}\>/ + +" highlight words for better writing ( http://mashable.com/2015/05/03/words-eliminate-vocabulary/ ) +match Todo /\\c\|\\c\|\\c\|\\c\|\\c\|\\c\|\\c\|\\c\|\\c\|\\c\|\\c\|\\c\|\\c\|\\c\|\\c/ + +" LanguageTool plugin +let g:languagetool_jar='/home/max/bin/languagetool/languagetool-commandline.jar' diff --git a/vim/.vim/_word-shortcuts.vim b/vim/.vim/_word-shortcuts.vim new file mode 100644 index 0000000..72ffc16 --- /dev/null +++ b/vim/.vim/_word-shortcuts.vim @@ -0,0 +1,18 @@ +" Some auto replacements for end of mails +iab _v Viele GrüßeMax +iab _vm Viele GrüßeMax Mehl +iab _bg Beste GrüßeMax +iab _bgm Beste GrüßeMax Mehl +iab _mfg Mit freundlichen GrüßenMax Mehl +iab _b Best,Max +iab _br Best regards,Max +iab _brm Best regards,Max Mehl +iab _s Sincerely,Max Mehl + +" Shortcuts for long words +iab _fsfe Free Software Foundation Europe + +" Auto-replace dumb typos +iab teh the +iab Teh The +iab MAx Max diff --git a/vim/.vim/advanced.vim b/vim/.vim/advanced.vim index a7df3b0..8be0ca6 100644 --- a/vim/.vim/advanced.vim +++ b/vim/.vim/advanced.vim @@ -1,16 +1,3 @@ -set tw=72 " text width for line-break -set comments=s1:/mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-,fb:* -set ai! " auto indent -set fo+=tcqn " format options - -" delete lines until end -nmap dG1o -map! dG1o - -" delete current line -nmap ddi -map! ddi - -" add empty line -nmap 1o -map! 1o +source ~/.vim/_formatting.vim +source ~/.vim/_line-shortcuts.vim +source ~/.vim/_word-shortcuts.vim diff --git a/vim/.vim/astroid.vim b/vim/.vim/astroid.vim index bb516ab..29a4e4c 100644 --- a/vim/.vim/astroid.vim +++ b/vim/.vim/astroid.vim @@ -1,3 +1,6 @@ +" Include all in mail +source ~/.vim/mail.vim + " Error message handling set shortmess=s " less messages set cmdheight=2 diff --git a/vim/.vim/mail.vim b/vim/.vim/mail.vim index 7c4e99e..16adb40 100644 --- a/vim/.vim/mail.vim +++ b/vim/.vim/mail.vim @@ -1,51 +1,6 @@ -""""" Mail specific setting, auto replacements etc, not depending on mail client +" Include all in advanced +source ~/.vim/advanced.vim -" hide gvim elements -set guioptions-=m "remove menu bar -set guioptions-=T "remove toolbar - -" Some auto replacements for end of mails -iab _v Viele GrüßeMax -iab _vm Viele GrüßeMax Mehl -iab _bg Beste GrüßeMax -iab _bgm Beste GrüßeMax Mehl -iab _mfg Mit freundlichen GrüßenMax Mehl -iab _b Best,Max -iab _br Best regards,Max -iab _brm Best regards,Max Mehl -iab _s Sincerely,Max Mehl - -" highlight CApital LEtter TYpos -:match Title /\<\u\{2}\l.\{-}\>/ - -" Auto-replace dumb typos -iab teh the -iab Teh The -iab MAx Max - -" Shortcuts for long words -iab _fsfe Free Software Foundation Europe - -"" Spell checking -setlocal spell spelllang=en_gb " default: EN spellcheck - -" Disable spell check -nmap :setlocal spell! -map! :setlocal spell!li - -" EN spell check -nmap :setlocal spell spelllang=en_gb -map! :setlocal spell spelllang=en_gbli - -" DE spell check -nmap :setlocal spell spelllang=de_20 -map! :setlocal spell spelllang=de_20li - -" highlight words for better writing ( http://mashable.com/2015/05/03/words-eliminate-vocabulary/ ) -match Todo /\\c\|\\c\|\\c\|\\c\|\\c\|\\c\|\\c\|\\c\|\\c\|\\c\|\\c\|\\c\|\\c\|\\c\|\\c/ - -" LanguageTool plugin -let g:languagetool_jar='/home/max/bin/languagetool/languagetool-commandline.jar' - -" Cut current email address -nnoremap BvEx +source ~/.vim/_email-addresses.vim +source ~/.vim/_spellcheck.vim +source ~/.vim/_gvim-style.vim diff --git a/vim/.vimrc b/vim/.vimrc index 362c3a3..40ca33b 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -27,17 +27,11 @@ set whichwrap+=<,>,[,] " ASTROID -autocmd BufRead /home/max/.cache/astroid/* :source ~/.vim/advanced.vim autocmd BufRead /home/max/.cache/astroid/* :source ~/.vim/astroid.vim -autocmd BufRead /home/max/.cache/astroid/* :source ~/.vim/mail.vim -autocmd BufRead /home/max/.cache/astroid/* :source ~/.vim/addresses.vim " Thunderbird -autocmd BufRead /tmp/*.eml :source ~/.vim/advanced.vim autocmd BufRead /tmp/*.eml :source ~/.vim/mail.vim " textern (Firefox Addon) -autocmd BufRead /*/textern/textern* :source ~/.vim/advanced.vim autocmd BufRead /*/textern/textern* :source ~/.vim/mail.vim -autocmd BufRead /*/textern*/*.txt :source ~/.vim/advanced.vim autocmd BufRead /*/textern*/*.txt :source ~/.vim/mail.vim