X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=bf94896e63485c3890fff7a26eb902392222bac9;hb=669c65e2be773dc0138879774637b2a6830b2ca6;hp=e640a42492b0cf5d2f8b95f43534f7d31e843629;hpb=8c3fac17e032443715a8279244d3253dd503bfca;p=config%2Fdotfiles.git diff --git a/vimrc b/vimrc index e640a42..bf94896 100644 --- a/vimrc +++ b/vimrc @@ -3,33 +3,74 @@ " EDITOR SETTINGS -" Make sure Vim (and not Vi) settings are enabled. +" 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. +if has('eval') + let s:save_runtimepath = &runtimepath + let s:save_diff = &diff +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 + let &diff = s:save_diff + unlet s:save_runtimepath + unlet s:save_diff +endif + +" Make sure Vim (and not Vi) settings are used. set nocompatible -" Load my scripts from ~/.vim (my scripts), ~/.vim/plugins (plugins) and -" ~/.vim/runtime (checkout of Vim runtime files). +" 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 + +" Load my scripts from ~/.vim (my scripts) and ~/.vim/runtime (checkout of Vim +" runtime files) if available. set runtimepath-=~/.vim -set runtimepath^=~/.vim,~/.vim/plugins,~/.vim/runtime +set runtimepath^=~/.vim,~/.vim/runtime -" When completing paths first use the longest path then display a list of all -" possible files. -set wildmode=longest,list +" 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 -" Increase number of tabs which can be opened with the -p option. -if v:version >= 700 - set tabpagemax=50 +" Disable modelines as they may cause security problems. Instead use +" securemodelines (Vim script #1876). +set nomodeline + +" 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. -if has("autocmd") +" 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 -" Use UTF-8 file encoding for all files. -set fileencodings=utf-8 +" Use UTF-8 file encoding for all files. Automatically recognize latin1 in +" existing files. +set fileencodings=utf-8,latin1 " Wrap text after 78 characters. set textwidth=78 @@ -38,7 +79,7 @@ set textwidth=78 set shiftwidth=4 set softtabstop=4 set expandtab -" When < and > is used indent/deindent to the next shiftwidth boundary. +" When < and > is used indent/deindent to the next 'shiftwidth' boundary. set shiftround " Use the default value for real tabs. set tabstop=8 @@ -64,11 +105,11 @@ set formatoptions+=l set virtualedit=block " Already display matches while typing the search command. This makes spotting -" errors easily. +" errors easy. set incsearch " Activate syntax folding. -if has("folding") +if has('folding') set foldmethod=syntax set foldcolumn=2 set foldlevel=99 " no closed folds at default, 'foldenable' would disable @@ -80,65 +121,184 @@ set ignorecase set smartcase " Activate spell checking, use English as default. -if v:version >= 700 - set spell +if exists('+spell') && has('syntax') + " But not when diffing as spell checking is distracting in this case. + if !&diff + set spell + endif set spelllang=en_us endif -" Allow buffers with changes to be hidden. +" Allow buffers with changes to be hidden. Very important for effective +" editing with multiple buffers. set hidden " DISPLAY SETTINGS -" Use a dark background. +" Use a dark background. Doesn't change the background color, only sets text +" colors for a dark terminal. set background=dark -" Activate lines display. +" 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 as "^I" and trailing space as "-". +" Display tabs, trailing space, non breakable spaces and long lines (when +" wrapping is disabled). set list -set listchars=trail:- +set listchars=trail:-,extends:> +if v:version >= 700 + set listchars+=nbsp:! +endif +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 - +" MAPPINGS (except for plugins, see PLUGIN SETTINGS below) -" Maps to change spell language between English and German and disable it. -if v:version >= 700 - map sn :set nospell - map se :set spell spelllang=en_us - map sd :set spell spelllang=de_de +" 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 / 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 +nnoremap 2 :2b +nnoremap 3 :3b +nnoremap 4 :4b +nnoremap 5 :5b +nnoremap 6 :6b +nnoremap 7 :7b +nnoremap 8 :8b +nnoremap 9 :9b +nnoremap 0 :10b + +" 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 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 " 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('.') . ';') +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 @@ -156,54 +316,260 @@ else endif " Make sure xa0 (alt + space) is automatically changed to a normal whitespace -" if pressed accidentally while in insert mode (happens on Mac sometimes). -if has("mac") - imap +" if pressed accidentally while in insert mode (happens on Mac when alt +" doesn't send escape). filereadable() is necessary for Leopard were 'mac' is +" no longer set on the console. +if has('mac') || filereadable('/Users/.localized') + inoremap 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 + +" in insert mode deletes a lot, break undo sequence before deleting the +" line so the change can be undone. Thanks to the vimrc_example.vim file in +" Vim's source. +inoremap u +" Same for (insert previously inserted text and leave insert mode). +inoremap u +" And for (insert previously inserted text). +inoremap u +" And for (delete word before cursor). +inoremap u + +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 + + +" ABBREVIATIONS + +" Fix some of my spelling mistakes. +iabbrev relle reelle +iabbrev reele reelle + " SYNTAX SETTINGS " Activate syntax coloring. -if has("syntax") +if has('syntax') syntax enable -" Highlight text longer then 78 characters. Thanks to Tony Mechelynck -" from the Vim mailing list. - if v:version >= 700 +" 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 when necessary with :2match (in Vim >= 700). + if exists(':2match') 2match Todo /\%>78v./ else match Todo /\%>78v./ endif + + 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 +if has('eval') +" 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") + " Don't create any mappings I don't want to use. let NERDCreateDefaultMappings = 0 + " Map toggle comment. + map NERDCommenterToggle + +" XPTemplate settings. + " 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 -" Map toggle comment. -map NERDCommenterToggle " AUTO COMMANDS " Use a custom auto group to prevent problems when the vimrc files is sourced " twice. -if has("autocmd") +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. + autocmd BufReadPost * + \ if line("'\"") > 1 && line("'\"") <= line("$") | + \ execute "normal! g'\"" | + \ endif +" 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 + +" Write file 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. + autocmd FileType deb setlocal nospell + autocmd FileType diff setlocal nospell + autocmd FileType tar setlocal nospell +" 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 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 + +" Recognize .md as markdown files (Vim default is .mkd). + autocmd BufRead,BufNewFile *.md set filetype=mkd +" Recognize .test as Tcl files. + autocmd BufRead,BufNewFile *.test set filetype=tcl + +" 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 AND COMMANDS + +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. + if !exists(":DiffOrig") + command DiffOrig + \ let s:diff_orig_filetype = &filetype + \ | vertical new + \ | let &filetype = s:diff_orig_filetype + \ | unlet s:diff_orig_filetype + \ | set buftype=nofile + \ | read ++edit # + \ | 0d_ + \ | diffthis + \ | wincmd p + \ | diffthis + endif +endif