X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/e29b37490e83f6645ae3acae39edffdee5cf7fc6..b546781a4dfb5c244a8813c1ee3e6383e3d725fb:/.vimrc?ds=sidebyside diff --git a/.vimrc b/.vimrc index 4651236..6712b95 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 @@ -195,7 +192,7 @@ set nowrap " wrap long lines at a character in 'breakat' " (local to window) " set nolbr lbr -set linebreak +" does not work with autocmd set list/nolist below " breakat " which characters might cause a line break @@ -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})[]:.)}/])+|[-\*.·→+])\s+' " formatexpr " expression used for "gq" to format lines @@ -851,7 +849,7 @@ set ci " (local to buffer) " set nopi pi """ set pi this ABORTS < 1:7.1-135+1 (see #446268) -if has('patch135') +if has('patch073') set pi endif @@ -879,7 +877,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 +909,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" @@ -1089,7 +1087,7 @@ set ar " directory " list of directories for the swap file " set dir=.,/home/madduck/tmp,/var/tmp,/tmp -set dir=.,~/tmp//,/var/tmp//,/tmp// +set dir=.,$TMPDIR//,/var/tmp//,/tmp// " swapfile " use a swap file for this buffer @@ -1099,6 +1097,7 @@ set dir=.,~/tmp//,/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 +1106,7 @@ set dir=.,~/tmp//,/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 @@ -1134,7 +1134,7 @@ set hi=100 " wildmode " specifies how command line completion works " set wim=full -set wim=list +set wim=list:full " suffixes " list of file name extensions that have a lower priority @@ -1415,12 +1415,12 @@ set secure " viewdir " directory where to store files with :mkview " set vdir=/home/madduck/.vim/view -set vdir=$VAR/vim/view +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$VAR/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,32 +1441,46 @@ set vi='1000,f1,\"1000,:20,/20,%,!,h,n$VAR/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 +" leave the w mark whenever a file is written +autocmd BufWrite * normal mw + +autocmd BufRead *.vcf set filetype=vcard -" jump to last known position in file (:he last-position-jump) -autocmd BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g'\"zz" | endif +" 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 - -if &cp | set nocp | endif -let s:cpo_save=&cpo -set cpo&vim +" flag trailing spaces as error only when not inserting +augroup tsperrorinsert + autocmd InsertEnter * match none /\s\+$/ + autocmd InsertLeave * match Error /\s\+$/ +augroup end " treat wrapped lines normally -map k gk -map gk -map j gj -map gj +nnoremap k gk +nnoremap gk +inoremap gk +nnoremap j gj +nnoremap gj +inoremap gj " this isn't windows, screw the F1->help key map @@ -1479,31 +1493,37 @@ 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 ft :%s,·, ,g:nohlsearch`` +map fs :%s,·, ,g:nohlsearch`` map sy :echo synIDattr(synID(line("."), col("."), 1), "name") -iab sgf Sehr geehrte Frau -iab sgh Sehr geehrter Herr -iab lf Liebe Frau -iab lh Lieber Herr -iab sgdh Sehr geehrte Damen und Herren -iab twimc To Whom It May Concern -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 +map / :nohlsearch + +omap [{ :normal {jj +nmap [{ :normal {jj +omap ]} :normal }kk +nmap ]} :normal }kk + +iab => ➬ + +let g:airline_theme='minimalist' + +try + execute pathogen#infect() +catch + "echo "Pathogen not installed" +endtry + +let g:is_posix = 1 + +let g:UltiSnipsExpandTrigger = "" +let g:UltiSnipsJumpForwardTrigger = "" +let g:UltiSnipsJumpBackwardTrigger = "" +map :UltiSnipsEdit +imap :UltiSnipsEdit let &cpo=s:cpo_save unlet s:cpo_save