X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/409e1493ea45058136564685915ae4dd6c8a427a..16cf0684409d79e8506c3218e8ddba7cf63e70ad:/.vimrc?ds=sidebyside

diff --git a/.vimrc b/.vimrc
index 209d079..3ea3e40 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:]]\+/"""
@@ -673,7 +670,7 @@ set fo=tcroqn1l
 " pattern to recognize a numbered list
 "       (local to buffer)
 "       set flp=^\\s*\\d\\+[\\]:.)}\\t\ ]\\s*
-set flp=^\\s*\\d\\+[\\]:.)}]\\s*
+let &flp='^\v\s*(((#|\a|\d{,4}|[ivx]{,4})[]:.)}/])+|[-\*.·→+])\s+'
 
 " formatexpr
 " expression used for "gq" to format lines
@@ -1100,6 +1097,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
@@ -1108,6 +1106,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
@@ -1421,7 +1420,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
@@ -1442,34 +1441,38 @@ 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
+" 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
-
-" treat wrapped lines normally
-nnoremap k gk
-nnoremap <Up> gk
-inoremap <Up> <C-\><C-o>gk
-nnoremap j gj
-nnoremap <Down> gj
-inoremap <Down> <C-\><C-o>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 <F1> <Esc>
@@ -1482,40 +1485,39 @@ map Q <Esc>
 let mapleader = ';'
 let maplocalleader = ';'
 
-imap <Leader>-- –
-imap <Leader>--- —
-imap <Leader>... …
-
 " replace fake tab chars with real ones
 map <Leader>ft :%s,⇝·*,	,g<CR>:nohlsearch<CR>``
 " replace fake spaces with real ones
 map <Leader>fs :%s,·, ,g<CR>:nohlsearch<CR>``
 
-map <Leader>sy :echo synIDattr(synID(line("."), col("."), 1), "name")<CR>
+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 <Leader>sy :call WhatHighlight()<CR>
 
 map <Leader>/ :nohlsearch<CR>
 
-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
+iab <Leader>→ ➬
 
-let &cpo=s:cpo_save
-unlet s:cpo_save
+try
+  execute pathogen#infect()
+catch
+  "echo "Pathogen not installed"
+endtry
+
+let g:is_posix = 1
 
-source $HOME/.vim/macros/table.vim
+let g:ycm_add_preview_to_completeopt="popup"
+let g:ycm_autoclose_preview_window_after_completion = 1
 
-let g:SuperTabMappingForward = '<nul>'
-let g:SuperTabMappingBackward = '<s-nul>'
+let g:UltiSnipsExpandTrigger = "<leader><tab>"
+let g:UltiSnipsJumpForwardTrigger = "<c-]>"
+let g:UltiSnipsJumpBackwardTrigger = "<c-[>"
+map <F10> :UltiSnipsEdit<cr>
+imap <F10> <esc>:UltiSnipsEdit<cr>
 
-match Error /\s\+$/
+let &cpo=s:cpo_save
+unlet s:cpo_save