X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/d79ccefe53846c5d9692e654d05110d00b95fb4f..52469072ce9042d0f373bb3cc73563c7c722f2ab:/.vimrc?ds=sidebyside

diff --git a/.vimrc b/.vimrc
index 7adcd858..81d94633 100644
--- a/.vimrc
+++ b/.vimrc
@@ -209,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
@@ -670,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|\d+)[\]:.)}\t/-]\s|[-\*.·→+]\s)\s*'
+let &flp='^\v\s*(((#|\a|\d{,4}|[ivx]{,4})[]:.)}/])+|[-\*.·→+])\s+'
 
 " formatexpr
 " expression used for "gq" to format lines
@@ -685,6 +685,7 @@ let &flp='^\v\s*((\a|\d+)[\]:.)}\t/-]\s|[-\*.·→+]\s)\s*'
 " 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
@@ -1441,20 +1442,22 @@ set vi=<1000,'1000,\"1000,:100,/100,@100,f1,%,!,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
 
-" jump to last known position in file (:he last-position-jump)
-autocmd BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g`\"zz" | endif
+packadd! editorconfig
+packadd! matchit
+packadd! gnupg
 
 " 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)
@@ -1475,18 +1478,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>
@@ -1498,23 +1489,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
@@ -1532,23 +1520,35 @@ 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
+
+iab <Leader>→ ➬
+
+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
-
-source $HOME/.vim/macros/table.vim
-
-let g:SuperTabMappingForward = '<nul>'
-let g:SuperTabMappingBackward = '<s-nul>'
-
-let g:is_posix = 1