Remove stuff from vimrc because of Tim Pope's unimpaired

[dotfiles.git] / vim / .vimrc

diff --git a/vim/.vimrc b/vim/.vimrc
index b9bb77da9745ab5b8170e152dd968cb27a966e0c..883546806d05a2e84b728ea427e5dac0b15d90e8 100644 (file)
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -38,7 +38,7 @@ set cursorline
 set cursorcolumn
 set colorcolumn=80
 highlight ExtraWhitespace ctermbg=green ctermfg=blue
-match ExtraWhitespace /^\s*$/
+match ExtraWhitespace /\s\+$/
 
 set relativenumber
 set numberwidth=3
@@ -103,6 +103,7 @@ autocmd VimResized * wincmd =
 " Tmux window naming {{{
 set titleold = ""
 set title
+autocmd BufEnter * let &titlestring = expand("%:t")
 " }}}
 
 " Fugitive {{{
@@ -117,27 +118,27 @@ set formatlistpat=^\\s*\\*\ \\s*
 set formatoptions+=n
 " }}}
 
-autocmd BufEnter * let &titlestring = expand("%:t")
-autocmd BufRead /tmp/mutt-* setlocal textwidth=72
-autocmd BufRead,BufNewFile *.pyi setlocal filetype=python
-autocmd BufRead,BufNewFile *.go setlocal noexpandtab
-autocmd BufRead,BufNewFile *.go let g:defsplit_shift=" "
-autocmd BufNewFile,BufRead *.tex abbreviate framedo \begin{frame}<CR>\frametitle{TODO}<CR>\end{frame}<ESC>k>>wwlcw
-autocmd BufNewFile,BufRead *.tex abbreviate itemdo \begin{itemize}<CR>\item <CR>\end{itemize}<ESC>k>>$a
-autocmd BufNewFile,BufRead *.tex abbreviate cnter \begin{center}<CR>\end{center}<ESC>k$o
-autocmd Filetype texinfo abbreviate \t @tab
-autocmd Filetype gitcommit setlocal textwidth=72
-autocmd BufRead /tmp/psql.edit* setlocal filetype=sql
-autocmd Filetype yaml setlocal shiftwidth=2
-
-set keywordprg=
+" Spelling {{{
+set spelllang=ru,en_gb
+highlight SpellBad cterm=inverse ctermfg=red ctermbg=black
+" }}}
 
+" Netrw {{{
 let g:netrw_banner = 0
 let g:netrw_bufsettings = "noma nomod nowrap ro nobl"
+" }}}
 
-" 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
 
 nmap <space> f<space>
 vmap <space> I<space><ESC>gv
@@ -146,9 +147,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
 
@@ -156,25 +154,18 @@ cmap <C-O> <S-Left>
 cmap <C-P> <S-Right>
 
 map Q gq
+map Y y$
 cmap ][ '[,']
+nmap <F2> :set wrap!<CR>:set wrap?<CR>
 nmap <Tab> :buffers<CR>:buffer<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 winc ]<CR>
+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