X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/75e33c719904b135279c74b946c98bcbe81a4a1b..52469072ce9042d0f373bb3cc73563c7c722f2ab:/.vimrc diff --git a/.vimrc b/.vimrc index a483050e..81d94633 100644 --- a/.vimrc +++ b/.vimrc @@ -1,6 +1,3 @@ -" vim: set ft=vim : -version 7.1 - " obtained from the output of :options, then postprocessed: " d2} " :%s/^ *[[:digit:]]\+/""" @@ -52,7 +49,7 @@ set pt= " list of flags specifying which commands wrap to another line " (local to window) " set ww= -set ww=b,s,[,],~ +set ww=b,s,[,<,>,],~ " startofline " many jump commands move the cursor to the first non-blank @@ -212,7 +209,7 @@ set nowrap " sidescrolloff " minimal number of columns to keep left and right of the cursor " set siso=0 -set siso=0 +set siso=1 " display " include "lastline" to show the last line even if it doesn't fit @@ -673,6 +670,7 @@ set fo=tcroqn1l " pattern to recognize a numbered list " (local to buffer) " set flp=^\\s*\\d\\+[\\]:.)}\\t\ ]\\s* +let &flp='^\v\s*(((#|\a|\d{,4}|[ivx]{,4})[]:.)}/])+|[-\*.·→+])\s+' " formatexpr " expression used for "gq" to format lines @@ -687,6 +685,7 @@ set fo=tcroqn1l " completeopt " whether to use a popup menu for Insert mode completion " set cot=menu,preview +set cot=menu,noinsert,popup,preview,fuzzy " pumheight " maximum height of the popup menu @@ -879,7 +878,6 @@ endif " foldlevelstart " value for 'foldlevel' when starting to edit a file " set fdls=-1 -set fdls=1 " foldcolumn " width of the column used to indicate folds @@ -912,6 +910,7 @@ set fdls=1 " folding type: "manual", "indent", "expr", "marker" or "syntax" " (local to window) " set fdm=manual +set fdm=marker " foldexpr " expression used when 'foldmethod' is "expr" @@ -1099,6 +1098,7 @@ set dir=.,$TMPDIR//,/var/tmp//,/tmp// " swapsync " "sync", "fsync" or empty; how to flush a swap file to disk " set sws=fsync +set sws= " updatecount " number of characters typed to cause a swap file update @@ -1107,6 +1107,7 @@ set dir=.,$TMPDIR//,/var/tmp//,/tmp// " updatetime " time in msec after which the swap file will be updated " set ut=4000 +set ut=10000 " maxmem " maximum amount of memory in Kbyte used for one buffer @@ -1420,7 +1421,7 @@ set vdir=$VARDIR/vim/view " viminfo " list that specifies what to write in the viminfo file " set vi= -set vi='1000,f1,\"1000,:20,/20,%,!,h,n$VARDIR/vim/viminfo +set vi=<1000,'1000,\"1000,:100,/100,@100,f1,%,!,h,n$VARDIR/vim/viminfo " bufhidden " what happens with a buffer when it's no longer in a window @@ -1441,36 +1442,41 @@ set vi='1000,f1,\"1000,:20,/20,%,!,h,n$VARDIR/vim/viminfo " set to "msg" to see all error messages " set debug= +if &cp | set nocp | endif +let s:cpo_save=&cpo +set cpo&vim + +let g:netrw_home="$VARDIR/vim" + filetype plugin indent on syntax on -colorscheme madduck -autocmd BufNewFile,BufRead /etc/logcheck/*.d*/* set tw=0 -autocmd BufNewFile,BufRead /home/madduck/debian/pkg/logcheck/*/rulefiles/linux/*.d*/* set tw=0 +packadd! editorconfig +packadd! matchit +packadd! gnupg + +" leave the w mark whenever a file is written +autocmd BufWrite * normal mw -" jump to last known position in file (:he last-position-jump) -autocmd BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g'\"zz" | endif +autocmd BufRead *.vcf set filetype=vcard + +" leave the i mark whenever we go idle (after updatetime) +"augroup markidle + "autocmd CursorHold * normal mi + "autocmd CursorHoldI * normal mi "DISABLED while broken (shifts left) +"augroup end " disable list mode when inserting stuff, otherwise keep it enabled, it's -" useful +" useful (see also setting lcs) augroup listinsert autocmd InsertEnter * set nolist autocmd InsertLeave * set list augroup end - -source $VIMRUNTIME/macros/table.vim - -if &cp | set nocp | endif -let s:cpo_save=&cpo -set cpo&vim - -" treat wrapped lines normally -nnoremap k gk -nnoremap gk -inoremap gk -nnoremap j gj -nnoremap gj -inoremap gj +" flag trailing spaces as error only when not inserting +augroup tsperrorinsert + autocmd InsertEnter * match none /\s\+$/ + autocmd InsertLeave * match Error /\s\+$/ +augroup end " this isn't windows, screw the F1->help key map @@ -1483,21 +1489,24 @@ map Q let mapleader = ';' let maplocalleader = ';' -imap -- – -imap --- — -imap ... … - " replace fake tab chars with real ones map ft :%s,⇝·*, ,g:nohlsearch`` " replace fake spaces with real ones map fs :%s,·, ,g:nohlsearch`` -map sy :echo synIDattr(synID(line("."), col("."), 1), "name") +function WhatHighlight() + echon 'hi<' . synIDattr(synID(line('.'),col('.'),1),'name') . '> ' + echon 'trans<' . synIDattr(synID(line('.'),col('.'),0),'name') . '> ' + echon 'lo<' . synIDattr(synIDtrans(synID(line('.'),col('.'),1)),'name') . '>' +endfunction + +map sy :call WhatHighlight() map / :nohlsearch iab sgf Sehr geehrte Frau iab sgh Sehr geehrter Herr +iab sghn Sehr geehrte Herren iab lf Liebe Frau iab lh Lieber Herr iab sgdh Sehr geehrte Damen und Herren @@ -1506,10 +1515,40 @@ iab lg liebe Grüsse iab Lg Liebe Grüsse iab fg Freundliche Grüsse iab mfg Mit freundlichen Grüssen -iab mbbg Mit bundesbrüderlichen Grüßen -iab mvbg Mit verbandsbrüderlichen Grüßen -iab vd Vielen Dank -iab vld Vielen lieben Dank +iab mbg Mit den besten Grüssen +iab hg Herzliche Grüsse +iab mhg Mit herzlichen Grüssen +iab mbbg Mit bundesbrüderlichen Grüssen +iab mvbg Mit verbandsbrüderlichen Grüssen +iab dallarmi Dall'Armi-Strasse +iab muc5 80538 München +iab muc6 80638 München + +iab → ➬ + +iab :thumbsup: 👍️ + +let g:ale_completion_enabled = 0 +let g:ale_fixers = { '*': [ "remove_trailing_lines", "trim_whitespace" ] } +let g:ale_sign_error = '>>' +let g:ale_sign_warning = '--' +let g:ale_set_loclist = 1 +let g:ale_open_list = 1 +let g:ale_virtualtext_cursor = 'current' +let g:ale_floating_window_border = repeat([''], 8) + +try + execute pathogen#infect() +catch + "echo "Pathogen not installed" +endtry + +set background=light +let g:artesanal_dimmed = 1 +let g:artesanal_transparent = 1 +colorscheme artesanal + +let g:is_posix = 1 let &cpo=s:cpo_save unlet s:cpo_save