X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=vim%2F.vimrc;h=2c728ba32f085bd84712c8855d1b6707022ca0ef;hb=092bb14d92b7fbdaa132fd2e2a70617a8045b6b3;hp=97f506d8ee02f5e107b3d955bbca9e9477a64abc;hpb=bb89ba6b30836733f4454d5b398ed2f41f936167;p=dotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index 97f506d..2c728ba 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -8,7 +8,6 @@ set nocompatible
 set encoding=utf-8
 "set t_kD=
 set mouse="" " if Vim is compiled with mouse support
-set nomodeline
 
 set viminfo='100,<50,s10,f1,%,n~/secure/vim/info
 set viewdir=~/secure/vim/view
@@ -28,11 +27,13 @@ set backspace=indent,eol
 set shortmess=aoOtI
 set highlight-=v:Visual
 set highlight+=vr
+set highlight+=sr
 set cpoptions+=$
 set showcmd
 set showmatch
-set listchars=trail:·,tab:→→,nbsp:% ",eol:¶
+set listchars=trail:·,tab:>→,nbsp:% ",eol:¶
 set list
+set completeopt-=preview
 
 set cursorline
 set cursorcolumn
@@ -49,8 +50,11 @@ set hlsearch
 set incsearch
 set gdefault
 set wildmode=longest:list
-set tags=tags;,./;
-set wildignore=**/_build/*,**/tags,**/.git,**/.hypothesis
+set tags=.tags/**/tags;
+set wildignore=**/.git,**/.tags
+
+set exrc
+set secure
 
 map <F4> :nohlsearch<CR>:MarkClear<CR>
 
@@ -67,19 +71,17 @@ highlight CursorColumn ctermfg=cyan ctermbg=red
 " }}}
 
 " Statusline {{{
-highlight User1 ctermbg=blue ctermfg=black
-highlight User2 ctermbg=green ctermfg=black
-highlight User3 ctermbg=yellow ctermfg=black
-highlight User4 ctermbg=red ctermfg=black
 set laststatus=2
-set statusline=%n\|%F%m%r%h%w%q\ %=
-set statusline+=%1*%Y[%{strlen(&fenc)?&fenc:&enc},%{&ff}]
-set statusline+=%2*[%l/%L]
-set statusline+=%3*[%c%V:0x%B]
-set statusline+=%4*%{LintStatus()}
+set statusline=%F\ %m%r%h%w%q%k\ %=
+set statusline+=%n\ %#Question#%Y
+set statusline+=%#DiffChange#%{strlen(&fenc)?&fenc:&enc}%{&bomb?'-bom':''}\ %{&ff}
+set statusline+=%#DiffAdd#%l/%L
+set statusline+=%#Todo#%c%V:0x%B
+set statusline+=%#Comment#%o
+set statusline+=%#Error#%{LintStatus()}
 set statusline+=%*\ %P
 
-function! LintStatus() " it is overrided in ftplugin/python/pylint.vim
+function! LintStatus() " it is overrided in ftplugins
     return ""
 endfunction
 " }}}
@@ -90,6 +92,7 @@ autocmd BufWinEnter *.* silent loadview
 " }}}
 
 " Windows related {{{
+nnoremap <C-b> <C-W>
 noremap <C-j> <C-w>j
 noremap <C-k> <C-w>k
 noremap <C-l> <C-w>l
@@ -103,30 +106,44 @@ autocmd VimResized * wincmd =
 " Tmux window naming {{{
 set titleold = ""
 set title
+autocmd BufEnter * let &titlestring = expand("%:t")
 " }}}
 
 " Fugitive {{{
-let g:fugitive_git_executable = "LANG=en.UTF-8 git"
-nmap <F7> "cyiw:execute "Gvsplit " . @c<CR>zR
+nmap <F7> :Gvsplit <C-R><C-W><CR>zR
 nmap <F9> :diffupdate<CR>:syntax off<CR>:syntax on<CR>
 " }}}
 
 " *-lists indentation and formatting {{{
 set comments-=mb:*
 set formatlistpat=^\\s*\\*\ \\s*
-set formatoptions+=n
+set formatoptions+=onj
 " }}}
 
-autocmd BufEnter * let &titlestring = expand("%:t")
-
-set keywordprg=
+" Spelling {{{
+set spelllang=ru,en_gb
+highlight SpellBad cterm=inverse ctermfg=red ctermbg=black
+highlight SpellLocal term=reverse ctermfg=red ctermbg=cyan
+" }}}
 
-let g:netrw_banner = 0
-let g:netrw_bufsettings = "noma nomod nowrap ro nobl"
+" Unimpaired-like textwidth switching {{{
+nmap [ob :set textwidth=72<CR>
+nmap ]ob :set textwidth=0<CR>
+" }}}
 
-" Often typos
+" Often typos {{{
 map q: :
 command! W w
+nmap <F1> :help!<CR>
+imap <F1> <C-O>:help!<CR>
+iabbrev итд и т.д.
+iabbrev итп и т.п.
+" }}}
+
+set keywordprg=
+let g:sh_no_error = 1
+
+set termwinkey=<C-B>
 
 nmap <space> f<space>
 vmap <space> I<space><ESC>gv
@@ -135,9 +152,6 @@ nmap _ f_l
 nmap <leader>] "*yiw
 nmap <leader>p "_diwP
 
-nmap ]q :cnext<CR>
-nmap [q :cprev<CR>
-
 nnoremap <leader>d "_d
 vnoremap <leader>d "_d
 
@@ -147,24 +161,16 @@ cmap <C-P> <S-Right>
 map Q gq
 map Y y$
 cmap ][ '[,']
-nmap <Tab> :buffers<CR>:buffer<Space>
+imap <C-b> <C-x><C-o>
+nmap <F2> :set wrap!<CR>:set wrap?<CR>
+nmap <Tab> :buffers<CR>:b<Space>
 nmap <silent> <Home> :registers<CR>
 nmap <leader>' yiwciw"<C-r>""<ESC>
 nmap <leader>h1 yypVr=o
-nmap <leader>72 :set textwidth=72
 nmap <leader>sc 024i-<ESC>a >8 <ESC>24a-<ESC>
 nmap <leader><C-]> :vertical wincmd ]<CR>
 nnoremap <C-P> <C-I>
 
-nmap <F1> :help!<CR>
-imap <F1> <C-O>:help!<CR>
-
-nmap <leader>sp :setlocal spell spelllang=ru,en_gb
-highlight SpellBad cterm=inverse ctermfg=red ctermbg=black
-
-iabbrev итд и т.д.
-iabbrev итп и т.п.
-
 command! E Explore
 command! Ch cd %:p:h
 command! -bar -nargs=? -bang Tmp :silent vnew<bang>|setlocal buftype=nofile bufhidden=hide noswapfile buflisted filetype=<args> modifiable