X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=c9726f2bbcfc6e85b5e19bded501f4b55a350713;hb=dce50a55e017a8b4af94e3a5d97d12dce38da551;hp=825aa4e33faab82ce710552c3e5b48cb1384ec51;hpb=da7b1cd63c5ed062102aecdbff66ac195a22d61f;p=config%2Fdotfiles.git diff --git a/vimrc b/vimrc index 825aa4e..c9726f2 100644 --- a/vimrc +++ b/vimrc @@ -1,6 +1,6 @@ " Vim main configuration file. -" Copyright (C) 2008-2012 Simon Ruderich +" Copyright (C) 2008-2016 Simon Ruderich " " This file is free software: you can redistribute it and/or modify " it under the terms of the GNU General Public License as published by @@ -21,7 +21,8 @@ " Save 'runtimepath' in case it was changed by the system's configuration " files. Also save 'diff' as set all& resets it; but somehow later (after " sourcing the vimrc - for example in a VimEnter autocmd) it gets -" automagically restored to the correct value. +" automagically restored to the correct value. Not sure what exactly Vim is +" doing there. if has('eval') let s:save_runtimepath = &runtimepath let s:save_diff = &diff @@ -40,6 +41,16 @@ endif " Make sure Vim (and not Vi) settings are used. set nocompatible +" Disallow :autocmd, shell and write commands in .vimrc and .exrc files in the +" current directory. Only used if 'exrc' is enabled (off by default), +" precaution just in case somebody enables 'exrc'. +set secure + +" Try to use pipes instead of temporary files. Prevents some auto commands +" from running for temporary files but also prevents the file's content to be +" written to disk. +set noshelltemp + " Use UTF-8 for all internal data (buffers, registers, etc.). This doesn't " affect reading files in different encodings, see 'fileencodings' for that. set encoding=utf-8 @@ -49,13 +60,15 @@ set encoding=utf-8 set runtimepath-=~/.vim set runtimepath^=~/.vim,~/.vim/runtime -" Don't store swap files in the same directory as the edited file. But only if +" Don't store swap files in the same directory as the edited file, but only if " we have a "safe" writable directory available. if filewritable('~/.tmp') == 2 || filewritable('~/tmp') == 2 set directory-=. endif " But store them in ~/.tmp or ~/tmp (already set by default) if available. set directory^=~/.tmp +" Never use /tmp which gets cleaned on reboot. +set directory-=/tmp " Disable modelines as they may cause security problems. Instead use " securemodelines (Vim script #1876). @@ -137,6 +150,15 @@ if has('eval') endif +" TERMINAL SETTINGS + +" Also enable fast terminal mode in GNU screen and tmux, but not for SSH +" connections. +if &term =~# '^screen' && !exists('$SSH_CONNECTION') + set ttyfast +endif + + " EDIT SETTINGS " Enable automatic file detection, plugin and indention support. @@ -149,7 +171,8 @@ endif " existing files. set fileencodings=utf-8,latin1 -" Always use unix line-endings for new files. +" Always use unix line-endings for new files. DOS line endings in existing +" files are recognized. set fileformats=unix,dos " Wrap text after 78 characters. @@ -180,7 +203,7 @@ set formatoptions+=ro " started. set formatoptions+=l " Remove comment leader when joining lines where it makes sense. -if HasVersionAndPatch(703, 541) +if s:HasVersionAndPatch(703, 541) set formatoptions+=j endif @@ -219,11 +242,16 @@ if exists('+spell') && has('syntax') set spelllang=en_us endif -" Allow buffers with changes to be hidden. Very important for effective +" Allow buffers with changes to be hidden. Very important for efficient " editing with multiple buffers. Prevents the "E37: No write since last change -" (add ! to override)" warning when switching buffers. +" (add ! to override)" warning when switching modified buffers. set hidden +" When splitting vertically put the new window right of the current one. +if has('vertsplit') + set splitright +endif + " DISPLAY SETTINGS @@ -243,7 +271,7 @@ set number if exists('+numberwidth') set numberwidth=1 endif -" Display the ruler with current line/file position. If 'statusline' is used +" 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. @@ -291,7 +319,7 @@ if has('statusline') " If there's more than one buffer return "/" (e.g. "/05") where " is the highest buffer number, otherwise return nothing. Used in " 'statusline' to get an overview of available buffer numbers. - function! StatuslineBufferCount() + function! s:StatuslineBufferCount() let l:bufnr = bufnr('$') if l:bufnr > 1 let l:result = '/' @@ -314,7 +342,7 @@ if has('statusline') " Like %f but use relative filename if it's shorter than the absolute path " (e.g. '../../file' vs. '~/long/path/to/file'). fnamemodify()'s ':.' is " not enough because it doesn't create '../'s. - function! StatuslineRelativeFilename() + function! s:StatuslineRelativeFilename() " Display only filename for help files. if &buftype == 'help' return expand('%:t') @@ -373,8 +401,32 @@ if has('statusline') endif endfunction + " Display unexpected 'fileformat', 'fileencoding' and 'bomb' settings. + function! s:StatuslineFileFormat() + if &fileformat != 'unix' + return '[' . &fileformat . ']' + else + return '' + endif + endfunction + function! s:StatuslineFileEncoding() + if &fileencoding != '' && &fileencoding != 'utf-8' + \ && &filetype != 'help' + return '[' . &fileencoding . ']' + else + return '' + endif + endfunction + function! s:StatuslineFileBOMB() + if exists('+bomb') && &bomb + return '[BOM]' + else + return '' + endif + endfunction + " Return current syntax group in brackets or nothing if there's none. - function! StatuslineSyntaxGroup() + function! s:StatuslineSyntaxGroup() let l:group = synIDattr(synID(line('.'), col('.'), 1), 'name') if l:group != '' return '[' . l:group . '] ' @@ -383,22 +435,49 @@ if has('statusline') endif endfunction + " Short function names to make 'statusline' more readable. + function! SBC() + return s:StatuslineBufferCount() + endfunction + function! SRF() + return s:StatuslineRelativeFilename() + endfunction + function! SFF() + return s:StatuslineFileFormat() + endfunction + function! SFE() + return s:StatuslineFileEncoding() + endfunction + function! SFB() + return s:StatuslineFileBOMB() + endfunction + function! SSG() + return s:StatuslineSyntaxGroup() + endfunction + set statusline= " on the left - set statusline+=%02n " buffer number - set statusline+=%{StatuslineBufferCount()} " highest buffer number + set statusline+=%02n " buffer number + set statusline+=%{SBC()} " highest buffer number set statusline+=: if has('modify_fname') && v:version >= 700 " some functions need 7.0 - set statusline+=%{StatuslineRelativeFilename()} " path to current file - set statusline+=\ " space after path + set statusline+=%{SRF()} " path to current file else - set statusline+=%f\ " path to current file in buffer + set statusline+=%f " path to current file in buffer + endif + set statusline+=\ " space after path + 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 + if v:version >= 700 " %#..# needs 7.0 + set statusline+=%#Error# " display warnings + set statusline+=%{SFF()} " - unexpected file format + set statusline+=%{SFE()} " - unexpected file encoding + set statusline+=%{SFB()} " - unexpected file byte order mask + set statusline+=%## " continue with normal colors endif - 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 @@ -417,13 +496,18 @@ endif " modified by a plugin or other settings. Except for which isn't " affected by mappings. -" Easy way to exit insert mode. jk is preferred because it's faster. -inoremap jj +" Easy way to exit insert mode (jj is too slow). inoremap jk " Also for command mode, thanks to http://github.com/mitechie/pyvim " (2010-10-15). -cnoremap jj cnoremap jk +" And fix my typos ... +inoremap JK +inoremap Jk +inoremap jK +cnoremap JK +cnoremap Jk +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). @@ -447,6 +531,11 @@ cmap cnoremap cnoremap +" Use :tjump to lookup tags (instead of :tag) which lists all available tags +" if there's more than one match. This is really helpful in larger projects +" where tags may occur multiple times. +nnoremap g + if has('eval') " Don't move the cursor to the first column for certain scroll commands (, , ). Thanks to jamessan in #vim on Freenode (2011-08-31 @@ -474,6 +563,10 @@ if has('eval') \ :call TemporaryNostartofline("C-U>") endif +" Let Y yank to the end of the line, similar to D and C. Use yy if you want to +" yank a line. This fixes a weird inconsistency in Vi(m). +nnoremap Y y$ + " 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. " Only the current buffer is written, thus switching to another buffer works @@ -533,6 +626,21 @@ nnoremap 8 :8buffer nnoremap 9 :9buffer nnoremap 0 :10buffer +" Use real tabs instead of soft tabs. +if has('eval') +" Switch from soft tabs to real tabs. + function! s:UseTabs() + setlocal noexpandtab shiftwidth=8 softtabstop=8 + endfunction + nnoremap t :call UseTabs() +endif +" Enable "verbatim" mode. Used to view files with long lines or without syntax +" coloring. 'list' is not changed, see next mapping. +nnoremap v :setlocal nowrap nospell synmaxcol=0 + \ :2match +" Toggle 'list'. +nnoremap l :set invlist + " Make last active window the only window. Similar to o. nnoremap O po @@ -549,17 +657,12 @@ else nmap sd endif -" Add semicolon to the end of the line. Thanks to -" http://www.van-laarhoven.org/vim/.vimrc for this idea and godlygeek in #vim -" on Freenode for an improved version which doesn't clobber any marks. -nnoremap ; :call setline(line('.'), getline('.') . ';') - +if has('eval') " * 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 l:temp = @@ + let l:temp = @@ " unnamed register normal! gvy " Added \C to force 'noignorecase' while searching the current visual " selection. I want to search for the exact string in this case. @@ -568,6 +671,16 @@ if has('eval') endfunction vnoremap * :call VSetSearch()// vnoremap # :call VSetSearch()?? + +" Use 'noignorecase' for * and #. See comment in s:VSetSearch() for details. +" Thanks to the writers of s:VSetSearch(), see above. + function! s:NSetSearch() + let l:cword = expand('') + let l:regex = substitute(escape(l:cword, '\'), '\n', '\\n', 'g') + let @/ = '\C\V'. '\<' . l:regex . '\>' + endfunction + nnoremap * :call NSetSearch()// + nnoremap # :call NSetSearch()?? endif " I often type "W" instead of "w" when trying to save a file. Fix my mistake. @@ -672,7 +785,11 @@ inoreabbrev completly completely " Activate syntax coloring. if has('syntax') - syntax enable + " But only if it wasn't already active. Prevents breaking the syntax + " coloring when reloading the vimrc. Thanks to johnLate for the idea. + if !exists('g:syntax_on') + syntax enable + endif " 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 @@ -707,7 +824,7 @@ if has('syntax') if !&diff && exists(':2match') " Use ColorColumn for overlong lines if available and my color " scheme is used. - if &t_Co == 256 && HasSyntaxGroup('ColorColumn') + if &t_Co == 256 && s:HasSyntaxGroup('ColorColumn') 2match ColorColumn /\%>78v./ else 2match Todo /\%>78v./ @@ -718,9 +835,9 @@ if has('syntax') if exists('*matchadd') " Highlight some important keywords in all documents. - let l:todos = ['TODO', 'XXX', 'FIXME', + let l:todos = ['TODO', 'XXX', 'FIXME', 'NOTE', \ 'CHANGED', 'REMOVED', 'DELETED'] - " Compatibility fix for Vim 6.4 which can't handle for in function + " Compatibility fix for Vim 6.4 which can't parse for in functions " (without function it's ignored). execute ' for l:x in l:todos' \ '| call matchadd("Todo", l:x)' @@ -739,17 +856,17 @@ if has('syntax') " Special highlight for tabs to reduce their visibility in contrast to other " SpecialKey characters (e.g. ^L). - if &t_Co == 256 && HasSyntaxGroup('specialKeyTab') + if &t_Co == 256 && s:HasSyntaxGroup('specialKeyTab') call matchadd('specialKeyTab', '\t') endif endif endfunction " Enable highlights for the current and all new windows. Thanks to bairui in " #vim on Freenode (2012-04-01 00:22 CEST) for the WinEnter suggestion. - call CustomSyntaxHighlights() + call s:CustomSyntaxHighlights() if has('autocmd') augroup vimrc - autocmd WinEnter * call CustomSyntaxHighlights() + autocmd WinEnter * call s:CustomSyntaxHighlights() augroup END endif @@ -757,26 +874,32 @@ if has('syntax') " C let g:c_no_if0_fold = 1 " fix weird double fold in #if0 in recent versions - " Haskell. + " Haskell let g:hs_highlight_delimiters = 1 let g:hs_highlight_boolean = 1 let g:hs_highlight_types = 1 let g:hs_highlight_more_types = 1 - " Perl. + " Java + let g:java_highlight_java_lang_ids = 1 " color java.lang.* identifiers + " 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 - " Python. + " PHP + let g:php_folding = 3 " fold functions + let g:php_short_tags = 0 " no short tags (), not always usable + let g:php_sql_query = 1 " highlight SQL queries in strings + " Python let g:python_highlight_all = 1 - " Shell. + " Shell let g:sh_noisk = 1 " don't add . to 'iskeyword' let g:sh_is_posix = 1 " POSIX shell (e.g. dash) is compatible enough let g:sh_fold_enabled = 7 " functions (1), heredoc (2) and if/do/for (4) - " Vim. + " Vim let g:vimsyn_embed = 0 " don't highlight embedded languages let g:vimsyn_folding = 'af' " folding for autogroups (a) and functions (f) - " XML. + " XML let g:xml_syntax_folding = 1 endif @@ -818,14 +941,20 @@ if has('eval') " Don't manage the working directory (the default setting is too slow for " me). let g:ctrlp_working_path_mode = 0 + " Path to cache directory. I prefer to keep generated files as local as " possible. let g:ctrlp_cache_dir = $HOME . '/.vim/cache/ctrlp' - " Permanent cache, cleared by a crontab entry. + " Permanent cache, cleared by a crontab entry. Use to update the + " cache manually. let g:ctrlp_clear_cache_on_exit = 0 + " Don't switch the window if the selected buffer is already open. I want + " to open another view on this buffer in most cases. + let g:ctrlp_switch_buffer = 0 + " FSWitch settings. - " Default don't work well for my projects. + " Defaults don't work well for my projects. augroup vimrc autocmd BufEnter *.cc let b:fswitchdst = 'h' \ | let b:fswitchlocs = './' @@ -835,13 +964,17 @@ if has('eval') " Switch to corresponding header/source file. nnoremap h :FSHere + +" netrw settings. + " Don't create ~/.vim/.netrwhist history file. + let g:netrw_dirhistmax = 0 endif " AUTO COMMANDS " Use a custom auto group to prevent problems when the vimrc files is sourced -" twice. +" multiple times. if has('autocmd') augroup vimrc @@ -867,15 +1000,16 @@ if has('autocmd') " 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. InsertLeave -" doesn't exist in older Vims. +" doesn't exist in older Vims. Use "*p to paste X11's selection, no need for +" 'paste' in this case. if exists('##InsertLeave') autocmd InsertLeave * set nopaste endif -" Write file when running :mak[e] before 'makeprg' is called. QuickFixCmdPre -" doesn't exist in older Vims. +" Write all files when running :mak[e] before 'makeprg' is called. +" QuickFixCmdPre doesn't exist in older Vims. if exists('##QuickFixCmdPre') - autocmd QuickFixCmdPre * write + autocmd QuickFixCmdPre * wall endif " Don't ignore case while in insert mode, but ignore case in all other modes. @@ -888,21 +1022,24 @@ if has('autocmd') endif " Display a warning when editing a file which contains "do not edit" (ignoring -" the case, \c), for example template files which were preprocessed or -" auto-generated files. Especially useful when the header is not displayed on -" the first screen, e.g. when the old position is restored. Not for vimrc -" though. +" the case) and similar messages in the first lines of the file, for example +" template files which were preprocessed or auto-generated files. Especially +" useful when the header is not displayed on the first screen, e.g. when the +" old position is restored. function! s:SearchForDoNotEditHeader() - if search('\cdo not edit', 'n') == 0 - \ || expand(':t') =~# '^.\?vimrc$' + " Only search the first 20 lines to prevent false positives, e.g. + " in scripts which write files containing this warning and ignore + " the case (\c). (Can't use search()'s {stopline} as we might not + " start searching from the top.) + let l:search = '\c\(do not \(edit\|modify\)\|autogenerated by\)' + let l:match = search(l:search, 'n') + if l:match == 0 || l:match > 20 return endif - echohl WarningMsg - echo 'Do not edit this file! (Maybe a template file.)' - echohl None + echoerr 'Do not edit this file! (Maybe a template file.)' endfunction - autocmd BufRead * call SearchForDoNotEditHeader() + autocmd BufRead * call s:SearchForDoNotEditHeader() " AFTER/FTPLUGIN AUTO COMMANDS @@ -919,6 +1056,9 @@ if has('autocmd') " the recommendation for git commit messages (http://tpope.net/node/106). autocmd FileType gitcommit let g:secure_modelines_allowed_items = [] | \ setlocal textwidth=72 +" Fix 'include' setting for shell files to recognize '.' and 'source' +" commands. + autocmd FileType sh let &l:include = '^\s*\(\.\|source\)\s\+' " 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. @@ -950,7 +1090,7 @@ if has('eval') " Convenient command to see the difference between the current buffer and the " file it was loaded from, thus the changes you made. Thanks to the " vimrc_example.vim file in Vim's source. Modified to use the same filetype -" for the diffed file than the filetype for the original file. +" for the diffed file as the filetype for the original file. if !exists(':DiffOrig') command DiffOrig \ let s:diff_orig_filetype = &filetype