X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/3f68af9813542a5e277b7a51b316644241c372d7..52469072ce9042d0f373bb3cc73563c7c722f2ab:/.vimrc

diff --git a/.vimrc b/.vimrc
index 6712b952..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{,4})[]:.)}/])+|[-\*.·→+])\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{,4})[]:.)}/])+|[-\*.·→+])\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
@@ -1449,7 +1450,10 @@ let g:netrw_home="$VARDIR/vim"
 
 filetype plugin indent on
 syntax on
-colorscheme madduck
+
+packadd! editorconfig
+packadd! matchit
+packadd! gnupg
 
 " leave the w mark whenever a file is written
 autocmd BufWrite * normal mw
@@ -1474,14 +1478,6 @@ augroup tsperrorinsert
   autocmd InsertLeave * match Error /\s\+$/
 augroup end
 
-" 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,18 +1494,48 @@ 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>
-
-map <Leader>/ :nohlsearch<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
 
-omap [{ :normal {jj<CR>
-nmap [{ :normal {jj<CR>
-omap ]} :normal }kk<CR>
-nmap ]} :normal }kk<CR>
+map <Leader>sy :call WhatHighlight()<CR>
 
-iab => ➬
+map <Leader>/ :nohlsearch<CR>
 
-let g:airline_theme='minimalist'
+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
+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 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 <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()
@@ -1517,13 +1543,12 @@ catch
   "echo "Pathogen not installed"
 endtry
 
-let g:is_posix = 1
+set background=light
+let g:artesanal_dimmed = 1
+let g:artesanal_transparent = 1
+colorscheme artesanal
 
-let g:UltiSnipsExpandTrigger = "<leader><tab>"
-let g:UltiSnipsJumpForwardTrigger = "<c-]>"
-let g:UltiSnipsJumpBackwardTrigger = "<c-[>"
-map <F10> :UltiSnipsEdit<cr>
-imap <F10> <esc>:UltiSnipsEdit<cr>
+let g:is_posix = 1
 
 let &cpo=s:cpo_save
 unlet s:cpo_save