From def34c32fb20935727a3de9042ea339a16ada542 Mon Sep 17 00:00:00 2001
From: Anton Bobov <abobov@gmail.com>
Date: Wed, 9 Jul 2014 11:14:57 +0600
Subject: Vimrc update.

---
 files/.gvimrc | 11 +++--------
 files/.vimrc  | 32 +++++++++++++++++++++++++++-----
 2 files changed, 30 insertions(+), 13 deletions(-)

(limited to 'files')

diff --git a/files/.gvimrc b/files/.gvimrc
index 27011d4..dae6fcc 100644
--- a/files/.gvimrc
+++ b/files/.gvimrc
@@ -1,17 +1,12 @@
 " Число строк в новом окне
 set lines=40
-" Отключение тулбара
-set guioptions-=T 
-" Горизонтальная прокрутка
-set guioptions-=b 
-" Вертикальная прокрутка
+set guioptions-=T
+set guioptions-=L
 set guioptions-=r
-" Убрать меню
 set guioptions-=m
-" Убрать мерцание курсора
 set guicursor+=a:blinkoff0
 
-" Set no visual bell again
+" Visual bell option reseted after starting gvim
 set t_vb=
 
 " Цвет меню дополнения
diff --git a/files/.vimrc b/files/.vimrc
index 75b1239..24a35d4 100644
--- a/files/.vimrc
+++ b/files/.vimrc
@@ -1,4 +1,4 @@
-" vim: spell spelllang=ru,en foldmethod=marker :
+" vim: spell foldmethod=marker :
 
 " Setup {{{1
 set nocompatible
@@ -86,6 +86,9 @@ set autoindent
 set copyindent
 set smartindent
 
+set splitright
+set splitbelow
+
 " List chars {{{
 
 set list
@@ -110,7 +113,7 @@ set expandtab
 set wrap
 set linebreak
 set textwidth=80
-
+set formatoptions=rqnl1j
 set cpoptions+=J
 
 " }}}
@@ -200,11 +203,13 @@ nnoremap L g_
 nnoremap J mzJ`z
 
 nnoremap <Leader>n :setlocal number!<cr>
+nnoremap <Leader>s :setlocal spell!<cr>
 
 nnoremap <Leader>p :silent! set paste<CR>"*p:set nopaste<CR>
 vnoremap <Leader>y "*y
 
-" Disable some keys
+" Disable keys {{{
+
 inoremap <F1> <Nop>
 nnoremap <F1> <Nop>
 vnoremap <F1> <Nop>
@@ -213,6 +218,8 @@ noremap <Down> <Nop>
 noremap <Left> <Nop>
 noremap <Right> <Nop>
 
+" }}}
+
 nnoremap <Space> za
 vnoremap <Space> za
 
@@ -228,10 +235,23 @@ nnoremap <C-y> 3<C-y>
 " Двигать блоки
 vnoremap < <gv
 vnoremap > >gv
-" Friendly moving over wrap lines
+
+" Wrapped lines navigation {{{
+
 nnoremap j gj
 nnoremap k gk
 
+nnoremap g$ $
+nnoremap $ g$
+nnoremap g0 0
+nnoremap 0 g0
+vnoremap g$ $
+vnoremap $ g$
+vnoremap g0 0
+vnoremap 0 g0
+
+" }}}
+
 " Speedup moving over windows
 map <C-h> <C-w>h
 map <C-j> <C-w>j
@@ -294,8 +314,10 @@ let NERDChristmasTree = 1
 let NERDTreeChDirMode = 2
 
 " Sparkup{{{2
-let g:sparkupNextMapping = '<c-x>'
 
+let g:sparkupNextMapping = '<c-s>'
+
+" 2}}}
 " Scratch {{{
 
 function! ScratchToggle()
-- 
cgit v1.2.3