X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/d9c2f3a6974308eebace858b251af04d00238ee2..3b7197faadda929dee36fd9799d3a0f2217d5935:/.vimrc?ds=inline

diff --git a/.vimrc b/.vimrc
index e530ec3..92f925f 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,7 +1,3 @@
-" vim: set ft=vim :
-version 7.1
-scriptencoding utf-8
-
 " obtained from the output of :options, then postprocessed:
 "   d2}
 "   :%s/^ *[[:digit:]]\+/"""
@@ -674,7 +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{1,2}|\d+)[]:.)}\t/-]|[-*.·→+])\s+'
+let &flp='^\v\s*(((#|\a|\d{,4}|[ivx]{,4})[]:.)}/])+|[-\*.·→+])\s+'
 
 " formatexpr
 " expression used for "gq" to format lines
@@ -1445,24 +1441,18 @@ set vi=<1000,'1000,\"1000,:100,/100,@100,f1,%,!,h,n$VARDIR/vim/viminfo
 " set to "msg" to see all error messages
 "       set debug=
 
-filetype plugin indent on
-syntax on
-colorscheme madduck
+if &cp | set nocp | endif
+let s:cpo_save=&cpo
+set cpo&vim
 
-autocmd BufNewFile,BufRead /etc/logcheck/*.d*/* set tw=0
-autocmd BufNewFile,BufRead /home/madduck/debian/pkg/logcheck/*/rulefiles/linux/*.d*/* set tw=0
-autocmd BufNewFile,BufRead /home/madduck/.tmp/dir????? set tw=0
+let g:netrw_home="$VARDIR/vim"
 
-" jump to last known position in file (:he last-position-jump)
-autocmd BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g`\"zz" | endif
+filetype plugin indent on
+syntax on
 
 " leave the w mark whenever a file is written
 autocmd BufWrite * normal mw
 
-" keep an extra backup of vimperator's ctrl-i
-autocmd BufWritePost */vimperator-*.tmp exe 'write ' . fnameescape((exists('$TMPDIR') ? $TMPDIR : '/tmp') . '/vimperator.ctrl-i.' . strftime('%Y.%m.%d.%H%M%S'))
-autocmd BufWritePost */pentadactyl.*.txt exe 'write ' . fnameescape((exists('$TMPDIR') ? $TMPDIR : '/tmp') . '/pentadactyl.ctrl-i.' . strftime('%Y.%m.%d.%H%M%S'))
-
 autocmd BufRead *.vcf set filetype=vcard
 
 " leave the i mark whenever we go idle (after updatetime)
@@ -1483,18 +1473,6 @@ augroup tsperrorinsert
   autocmd InsertLeave * match Error /\s\+$/
 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
-
 " this isn't windows, screw the F1->help key
 map <F1> <Esc>
 imap <F1> <Esc>
@@ -1506,23 +1484,20 @@ 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>/ :nohlsearch<CR>
+map <Leader>sy :call WhatHighlight()<CR>
 
-omap [{ :normal {jj<CR>
-nmap [{ :normal {jj<CR>
-omap ]} :normal }kk<CR>
-nmap ]} :normal }kk<CR>
+map <Leader>/ :nohlsearch<CR>
 
 iab sgf Sehr geehrte Frau
 iab sgh Sehr geehrter Herr
@@ -1540,23 +1515,34 @@ 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 vd Vielen Dank
-iab vld Vielen lieben Dank
-iab vhd Vielen herzlichen Dank
-iab email e-mail
-iab emails e-mails
-iab Email E-mail
-iab Emails E-mails
-iab mk Martin Krafft
-iab mfk Martin F. Krafft
-iab addr Hanfstaenglstraße 15
D–80638 München
+iab dallarmi Dall'Armi-Strasse
+iab muc5 80538 München
+iab muc6 80638 München
 
-let &cpo=s:cpo_save
-unlet s:cpo_save
+iab <Leader>→ ➬
 
-source $HOME/.vim/macros/table.vim
+try
+  execute pathogen#infect()
+catch
+  "echo "Pathogen not installed"
+endtry
 
-let g:SuperTabMappingForward = '<nul>'
-let g:SuperTabMappingBackward = '<s-nul>'
+set background=light
+let g:artesanal_dimmed = 1
+let g:artesanal_transparent = 1
+colorscheme artesanal
 
 let g:is_posix = 1
+
+let g:ycm_add_preview_to_completeopt="popup"
+let g:ycm_autoclose_preview_window_after_completion = 1
+
+let g:UltiSnipsExpandTrigger = "<leader><tab>"
+let g:UltiSnipsJumpForwardTrigger = "<c-]>"
+let g:UltiSnipsJumpBackwardTrigger = "<c-[>"
+let g:UltiSnipsListSnippets = "<leader>q"
+map <F10> :UltiSnipsEdit<cr>
+imap <F10> <esc>:UltiSnipsEdit<cr>
+
+let &cpo=s:cpo_save
+unlet s:cpo_save