X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/b546781a4dfb5c244a8813c1ee3e6383e3d725fb..2f977b1ab25c12705d441fc0809f01543c8efb31:/.vimrc?ds=sidebyside

diff --git a/.vimrc b/.vimrc
index 6712b95..92f925f 100644
--- a/.vimrc
+++ b/.vimrc
@@ -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
@@ -1449,7 +1449,6 @@ let g:netrw_home="$VARDIR/vim"
 
 filetype plugin indent on
 syntax on
-colorscheme madduck
 
 " leave the w mark whenever a file is written
 autocmd BufWrite * normal mw
@@ -1474,14 +1473,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 +1489,37 @@ 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>→ ➬
 
 try
   execute pathogen#infect()
@@ -1517,11 +1527,20 @@ 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 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>