split vim config

2021-04-25 22:04:51 +02:00
parent e135d0bd55
commit f50bbe77ab
10 changed files with 71 additions and 73 deletions
--- a/vim/.gitignore
+++ b/vim/.gitignore
@@ -1,3 +1,3 @@
 .vim/spell/*.add
 .vim/spell/*.spl
-.vim/addresses.vim
+.vim/_email-addresses.vim
--- a/vim/.vim/_formatting.vim
+++ 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
--- a/vim/.vim/_gvim-style.vim
+++ b/vim/.vim/_gvim-style.vim
@@ -0,0 +1,3 @@
+ " hide gvim elements
+set guioptions-=m  "remove menu bar
+set guioptions-=T  "remove toolbar
--- a/vim/.vim/_line-shortcuts.vim
+++ b/vim/.vim/_line-shortcuts.vim
@@ -0,0 +1,11 @@
+" delete lines until end
+nmap <C-d> dG1o
+map! <C-d> <ESC>dG1o
+
+" delete current line
+nmap <C-s> ddi
+map! <C-s> <ESC>ddi
+
+" add empty line
+nmap <C-a> 1o
+map! <C-a> <ESC>1o
--- a/vim/.vim/_spellcheck.vim
+++ b/vim/.vim/_spellcheck.vim
@@ -0,0 +1,22 @@
+setlocal spell spelllang=en_gb   " default: EN spellcheck
+
+" Disable spell check
+nmap <F2> :setlocal spell!<CR>
+map! <F2> <ESC>:setlocal spell!<CR>li
+
+" EN spell check
+nmap <F3> :setlocal spell spelllang=en_gb<CR>
+map! <F3> <ESC>:setlocal spell spelllang=en_gb<CR>li
+
+" DE spell check
+nmap <F4> :setlocal spell spelllang=de_20<CR>
+map! <F4> <ESC>:setlocal spell spelllang=de_20<CR>li
+
+" 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 /\<that\>\c\|\<went\>\c\|\<honestly\>\c\|\<absolutely\>\c\|\<very\>\c\|\<really\>\c\|\<amazing\>\c\|\<always\>\c\|\<never\>\c\|\<literally\>\c\|\<just\>\c\|\<maybe\>\c\|\<stuff\>\c\|\<thing\>\c\|\<irregardless\>\c/
+
+" LanguageTool plugin
+let g:languagetool_jar='/home/max/bin/languagetool/languagetool-commandline.jar'
--- a/vim/.vim/_word-shortcuts.vim
+++ b/vim/.vim/_word-shortcuts.vim
@@ -0,0 +1,18 @@
+" Some auto replacements for end of mails
+iab _v Viele Grüße<C-M>Max
+iab _vm Viele Grüße<C-M>Max Mehl
+iab _bg Beste Grüße<C-M>Max
+iab _bgm Beste Grüße<C-M>Max Mehl
+iab _mfg Mit freundlichen Grüßen<C-M>Max Mehl
+iab _b Best,<C-M>Max
+iab _br Best regards,<C-M>Max
+iab _brm Best regards,<C-M>Max Mehl
+iab _s Sincerely,<C-M>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
--- 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 <C-d> dG1o
-map! <C-d> <ESC>dG1o
-
-" delete current line
-nmap <C-s> ddi
-map! <C-s> <ESC>ddi
-
-" add empty line
-nmap <C-a> 1o
-map! <C-a> <ESC>1o
+source ~/.vim/_formatting.vim
+source ~/.vim/_line-shortcuts.vim
+source ~/.vim/_word-shortcuts.vim
--- 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
--- 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üße<C-M>Max
-iab _vm Viele Grüße<C-M>Max Mehl
-iab _bg Beste Grüße<C-M>Max
-iab _bgm Beste Grüße<C-M>Max Mehl
-iab _mfg Mit freundlichen Grüßen<C-M>Max Mehl
-iab _b Best,<C-M>Max
-iab _br Best regards,<C-M>Max
-iab _brm Best regards,<C-M>Max Mehl
-iab _s Sincerely,<C-M>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 <F2> :setlocal spell!<CR>
-map! <F2> <ESC>:setlocal spell!<CR>li
-
-" EN spell check
-nmap <F3> :setlocal spell spelllang=en_gb<CR>
-map! <F3> <ESC>:setlocal spell spelllang=en_gb<CR>li
-
-" DE spell check
-nmap <F4> :setlocal spell spelllang=de_20<CR>
-map! <F4> <ESC>:setlocal spell spelllang=de_20<CR>li
-
-" highlight words for better writing ( http://mashable.com/2015/05/03/words-eliminate-vocabulary/ )
-match Todo /\<that\>\c\|\<went\>\c\|\<honestly\>\c\|\<absolutely\>\c\|\<very\>\c\|\<really\>\c\|\<amazing\>\c\|\<always\>\c\|\<never\>\c\|\<literally\>\c\|\<just\>\c\|\<maybe\>\c\|\<stuff\>\c\|\<thing\>\c\|\<irregardless\>\c/
-
-" LanguageTool plugin
-let g:languagetool_jar='/home/max/bin/languagetool/languagetool-commandline.jar'
-
-" Cut current email address
-nnoremap <M-x> BvEx
+source ~/.vim/_email-addresses.vim
+source ~/.vim/_spellcheck.vim
+source ~/.vim/_gvim-style.vim
--- 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