X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=c3a85eb20042b900e658becc8ca0d7e0b2e71469;hb=b122832efa953ed888415f7a3959d4cbeae6e265;hp=bd82bc11dd218fbe618643af4e9ae54034535e46;hpb=7a52215db3ea82cc50494927e7a3db149559388f;p=config%2Fdotfiles.git diff --git a/vimrc b/vimrc index bd82bc1..c3a85eb 100644 --- a/vimrc +++ b/vimrc @@ -3,6 +3,20 @@ " EDITOR SETTINGS +" Save 'runtimepath' in case it was changed by the system's configuration +" files. +if has('eval') + let s:save_runtimepath = &runtimepath +endif +" Reset all options (except 'term', 'lines' and 'columns'). This makes sure a +" system wide configuration file doesn't change default values. +set all& +" And restore it after all other options were reset. +if has('eval') + let &runtimepath = s:save_runtimepath + unlet s:save_runtimepath +endif + " Make sure Vim (and not Vi) settings are used. set nocompatible @@ -11,19 +25,37 @@ set nocompatible set runtimepath-=~/.vim set runtimepath^=~/.vim,~/.vim/runtime +" Don't store swap files in the same directory as the edited file. +set directory-=. +" But store them in ~/.tmp if available. +set directory^=~/.tmp + " Disable modelines as they may cause security problems. Instead use " securemodelines (Vim script #1876). set nomodeline -" When completing paths first use the longest path then display a list of all -" possible files. -set wildmode=longest,list +" Complete to longest common string (list:longest) and then complete all full +" matches after another (full). Thanks to pbrisbin +" (http://pbrisbin.com:8080/dotfiles/vimrc). +set wildmode=list:longest,full + +" Increase history of executed commands (:). +set history=1000 + +" Increase number of possible undos. +set undolevels=1000 + +" Use strong encryption if possible, also used for swap/undo files. +if exists('+cryptmethod') + set cryptmethod=blowfish +endif " EDIT SETTINGS " Enable automatic file detection, plugin and indention support. if has('autocmd') + filetype off " necessary for pathogen to force a reload of ftplugins filetype plugin indent on endif @@ -81,7 +113,7 @@ set smartcase " Activate spell checking, use English as default. Don't use spell checking " when diffing. -if v:version >= 700 && has('syntax') && !&diff +if exists('+spell') && has('syntax') && !&diff set spell set spelllang=en_us endif @@ -99,35 +131,107 @@ set background=dark " Display line numbers. set number -" Display the ruler with current line/file position. +" But use as little space as necessary for the numbers column. Thanks to James +" Vega (http://git.jamessan.com/?p=etc/vim.git;a=summary). +if exists('+numberwidth') + set numberwidth=1 +endif +" Display the ruler with current line/file position. If 'statusline' is used +" then this only affects . set ruler " Display partial commands in the status line. set showcmd +" Don't redraw screen when executing macros; increases speed. Thanks to James +" Vega (http://git.jamessan.com/?p=etc/vim.git;a=summary). +set lazyredraw + " Visualize the line the cursor is currently in. -if v:version >= 700 +if exists('+cursorline') set cursorline endif " Display tabs, trailing space, non breakable spaces and long lines (when -" wrapping is enabled). +" wrapping is disabled). set list set listchars=trail:-,extends:> if v:version >= 700 set listchars+=nbsp:! endif -" Always display the status line even if there is only one window. if has('statusline') + " Always display the status line even if there is only one window. set laststatus=2 + + set statusline= + " on the left + set statusline+=%02n: " buffer number + set statusline+=%f\ " path to current file in buffer + set statusline+=%h " [help] if buffer is help file + set statusline+=%w " [Preview] if buffer is preview buffer + set statusline+=%m " [+] if buffer was modified, + " [-] if 'modifiable' is off + set statusline+=%r " [RO] if buffer is read only + + " on the right + set statusline+=%= " right align + set statusline+=0x%-8B\ " current character under cursor as hex + set statusline+=%-12.(%l,%c%V%)\ " line number (%l), + " column number (%c), + " virtual column number if different + " than %c (%V) + set statusline+=%P " position in file in percent endif " MAPPINGS (except for plugins, see PLUGIN SETTINGS below) -" Use to move down a page and - to move up one like in mutt. -nnoremap -nnoremap - +" Easy way to exit insert mode. +inoremap jj +inoremap jk +" Also for command mode, thanks to http://github.com/mitechie/pyvim +" (2010-10-15). +cnoremap jj +cnoremap jk + +" Disable arrow keys for all modes except command modes. Thanks to James Vega +" (http://git.jamessan.com/?p=etc/vim.git;a=summary). +map +map +map +map +imap +imap +imap +imap +" Also disable arrow keys in command mode, use / as replacement (see +" below). +cmap +cmap +cmap +cmap + +" Use Ctrl-P/Ctrl-N as replacement for / in command mode. Thanks to +" abstrakt and grayw in #vim on Freenode (2010-04-12 21:20 CEST). +cnoremap +cnoremap + +" Write before suspending, thanks to deryni in #vim on Freenode (2011-05-09 +" 20:02 CEST). To suspend without saving either unmap this or use :stop. +nnoremap :update:stop + +" 2 gives more verbose information, use it by default. Thanks to NCS_One +" in #vim on Freenode (2011-08-15 00:17 CEST). +nnoremap 2 + +" Use to move down a page and - to move up one like in mutt. +nnoremap +nnoremap - + +" Go to next and previous buffer. Thanks to elik in #vim on Freenode +" (2010-05-16 18:38 CEST) for this idea. +nnoremap gb :bnext +nnoremap gB :bprev " Fast access to buffers. nnoremap 1 :1b @@ -141,15 +245,15 @@ nnoremap 8 :8b nnoremap 9 :9b nnoremap 0 :10b -" Make last active window the only window. Similar to o. -nnoremap O po +" Make last active window the only window. Similar to o. +nnoremap O po " Maps to change spell language between English and German and disable spell " checking. -if v:version >= 700 - map sn :set nospell - map se :set spell spelllang=en_us - map sd :set spell spelllang=de_de +if exists('+spell') + noremap sn :set nospell + noremap se :set spell spelllang=en_us + noremap sd :set spell spelllang=de_de endif " Add semicolon to the end of the line. Thanks to @@ -157,16 +261,33 @@ endif " on Freenode for an improved version which doesn't clobber any marks. nnoremap ; :call setline(line('.'), getline('.') . ';') +" * and # for selections in visual mode. Thanks to +" http://got-ravings.blogspot.com/2008/07/vim-pr0n-visual-search-mappings.html +" and all nerds involved (godlygeek, strull in #vim on Freenode). +if has('eval') + function! s:VSetSearch() + let temp = @@ + normal! gvy + let @/ = '\V' . substitute(escape(@@, '\'), '\n', '\\n', 'g') + let @@ = temp + endfunction + vnoremap * :call VSetSearch()// + vnoremap # :call VSetSearch()?? +endif + " I often type "W" instead of "w" when trying to save a file. Fix my mistake. " Thanks to Tony Mechelynck from the Vim " mailing list for the commands. if v:version < 700 cnoreabbrev W w + cnoreabbrev Wa wa cnoreabbrev Wq wq cnoreabbrev Wqa wqa else cnoreabbrev W \ ((getcmdtype() == ':' && getcmdpos() <= 2) ? 'w' : 'W') + cnoreabbrev Wa + \ ((getcmdtype() == ':' && getcmdpos() <= 3) ? 'wa' : 'Wa') cnoreabbrev Wq \ ((getcmdtype() == ':' && getcmdpos() <= 3) ? 'wq' : 'Wq') cnoreabbrev Wqa @@ -192,10 +313,21 @@ if has('mac') || filereadable('/Users/.localized') endif " Disable Apple style movements in MacVim. -if has('gui_macvim') && has('eval') - let macvim_skip_cmd_opt_movement = 1 +if has('gui_macvim') + let g:macvim_skip_cmd_opt_movement = 1 endif +" In case 'hlsearch' is used disable it with . Thanks to frogonwheels and +" vimgor (bot) in #vim on Freenode (2010-03-30 05:58 CEST). +noremap :nohlsearch + + +" ABBREVIATIONS + +" Fix some of my spelling mistakes. +iabbrev relle reelle +iabbrev reele reelle + " SYNTAX SETTINGS @@ -203,31 +335,79 @@ endif if has('syntax') syntax enable +" Don't highlight more than 500 columns as I normally don't have that long +" lines and they slow down syntax coloring. Thanks to Derek Wyatt +" (http://www.derekwyatt.org/vim/the-vimrc-file/). + if exists('+synmaxcol') + set synmaxcol=500 + endif + " Highlight lines longer than 78 characters. Thanks to Tony Mechelynck -" from the Vim mailing list. -" It can easily be disabled if necessary with :2match (in Vim >= 700). - if v:version >= 700 +" from the Vim mailing list. It can easily be +" disabled when necessary with :2match (in Vim >= 700). + if exists(':2match') 2match Todo /\%>78v./ else match Todo /\%>78v./ endif -" Highlight TODO, FIXME, CHANGED and XXX in all documents. - if v:version > 701 || (v:version == 701 && has('patch42')) - call matchadd('Todo', '\(TODO\|FIXME\|CHANGED\|XXX\)') + if exists('*matchadd') +" Highlight some important keywords in all documents. + for x in ['TODO', 'XXX', 'FIXME', 'CHANGED', 'REMOVED', 'DELETED'] + call matchadd('Todo', x) + endfor + +" Highlight unicode whitespace which is no normal whitespace (0x20). + for x in ['00a0', '1680', '180e', '2000', '2001', '2002', '2003', + \ '2004', '2005', '2006', '2007', '2008', '2009', '200a', + \ '200b', '200c', '200d', '202f', '205f', '2060', '3000', + \ 'feff'] + call matchadd('Error', '\%u' . x) + endfor endif + +" Settings for specific filetypes. + + " Haskell. + let g:hs_highlight_boolean = 1 + let g:hs_highlight_types = 1 + let g:hs_highlight_more_types = 1 + + " Perl. + let g:perl_fold = 1 + let g:perl_fold_blocks = 1 + let g:perl_nofold_packages = 1 + let g:perl_include_pod = 1 " syntax coloring for PODs endif " PLUGIN SETTINGS +" Use pathogen which allows one 'runtimepath' entry per plugin. This makes +" installing/removing/updating plugins simple. (Used for plugins with more +" than one file.) +if v:version >= 700 + execute 'call pathogen#runtime_append_all_bundles()' +endif + " Settings for the NERD commenter. " Don't create any mappings I don't want to use. if has('eval') - let NERDCreateDefaultMappings = 0 + let g:NERDCreateDefaultMappings = 0 endif " Map toggle comment. -map NERDCommenterToggle +map NERDCommenterToggle + +" XPTemplate settings. +if has('eval') + " Try to maintain snippet rendering even after editing outside of a + " snippet. + let g:xptemplate_strict = 0 + " Don't complete any braces automatically. + let g:xptemplate_brace_complete = 0 + " Only highlight the current placeholder. + let g:xptemplate_highlight = 'current' +endif " AUTO COMMANDS @@ -236,6 +416,7 @@ map NERDCommenterToggle " twice. if has('autocmd') augroup vimrc +" Remove all autocmds from the current group. autocmd! " Go to last position of opened files. Taken from :help last-position-jump. @@ -246,6 +427,27 @@ if has('autocmd') " But not for Git commits, go to beginning of the file. autocmd BufReadPost COMMIT_EDITMSG normal! gg +" Make sure 'list' and 'number' is disabled in help files. This is necessary +" when switching to a help buffer which is in the background with :buffer as +" these options are local to windows (and not only to buffers). This happens +" because I often want to use only one window and thus the help buffer is in +" the background. + autocmd BufWinEnter *.txt + \ if &filetype == 'help' | + \ setlocal nolist | + \ setlocal nonumber | + \ endif + +" Automatically disable 'paste' mode when leaving insert mode. Thanks to +" Raimondi in #vim on Freenode (2010-08-14 23:01 CEST). Very useful as I only +" want to paste once and then 'paste' gets automatically unset. + if exists('##InsertLeave') + autocmd InsertLeave * set nopaste + endif + +" Save changes when running :mak[e] before 'makeprg' is called. + autocmd QuickFixCmdPre * write + " AFTER/FTPLUGIN AUTO COMMANDS " Disable spell checking for files which don't need it. @@ -255,15 +457,16 @@ if has('autocmd') " Fix to allow Vim edit crontab files as crontab doesn't work with " backupcopy=auto. autocmd FileType crontab setlocal backupcopy=yes -" Don't use the modeline as the diff created by `git commit -v` may contain -" one which could change the filetype or other settings of the commit window. - autocmd FileType gitcommit setlocal nomodeline | - \ let g:secure_modelines_allowed_items = [] -" Allow folding in perl. - autocmd FileType perl let perl_fold = 1 | - \ let perl_fold_blocks = 1 -" Use the same comment string as for Vim files in vimperator files. +" Don't use the modeline in git commits as the diff created by `git commit -v` +" may contain one which could change the filetype or other settings of the +" commit buffer. Also make sure we use only 72 characters per line which is +" the recommendation for git commit messages (http://tpope.net/node/106). + autocmd FileType gitcommit let g:secure_modelines_allowed_items = [] | + \ setlocal textwidth=72 +" Use the same comment string as for Vim files in Vimperator files. autocmd FileType vimperator setlocal commentstring=\"%s +" Use tex compiler for (La)TeX files. + autocmd FileType tex compiler tex " FTDETECT AUTO COMMANDS @@ -274,8 +477,61 @@ if has('autocmd') " OTHER AUTO COMMANDS +" Disable spell checking, displaying of list characters and long lines when +" viewing documentation. + autocmd BufReadPost /usr/share/doc/* setlocal nospell nolist | 2match + " Use diff filetype for mercurial patches in patch queue. autocmd BufReadPost */.hg/patches/* set filetype=diff augroup END endif + + +" CUSTOM FUNCTIONS + +if has('eval') + " New text-objects ii and ai to work on text with the same indentation. + " Thanks to + " http://vim.wikia.com/index.php?title=Indent_text_object&oldid=27126 + " (visited on 2011-11-19). + onoremap ai :call IndTxtObj(0) + onoremap ii :call IndTxtObj(1) + vnoremap ai :call IndTxtObj(0)gv + vnoremap ii :call IndTxtObj(1)gv + + function! s:IndTxtObj(inner) + let curline = line(".") + let lastline = line("$") + let i = indent(line(".")) - &shiftwidth * (v:count1 - 1) + let i = i < 0 ? 0 : i + if getline(".") !~ "^\\s*$" + let p = line(".") - 1 + let nextblank = getline(p) =~ "^\\s*$" + while p > 0 + \ && ((i == 0 && !nextblank) + \ || (i > 0 && ((indent(p) >= i + \ && !(nextblank && a:inner)) + \ || (nextblank && !a:inner)))) + - + let p = line(".") - 1 + let nextblank = getline(p) =~ "^\\s*$" + endwhile + normal! 0V + call cursor(curline, 0) + let p = line(".") + 1 + let nextblank = getline(p) =~ "^\\s*$" + while p <= lastline + \ && ((i == 0 && !nextblank) + \ || (i > 0 && ((indent(p) >= i + \ && !(nextblank && a:inner)) + \ || (nextblank && !a:inner)))) + + + let p = line(".") + 1 + let nextblank = getline(p) =~ "^\\s*$" + endwhile + normal! $ + endif + endfunction + +endif