aboutsummaryrefslogtreecommitdiff
path: root/files/.vimrc
diff options
context:
space:
mode:
authorAnton Bobov <abobov@gmail.com>2014-07-09 11:14:57 +0600
committerAnton Bobov <abobov@gmail.com>2014-07-09 22:17:49 +0600
commitdef34c32fb20935727a3de9042ea339a16ada542 (patch)
tree32330b034453f516f4a08a9a416d26c303249659 /files/.vimrc
parentc82f91eff5edd473875689e20237add1d9bc4db3 (diff)
Vimrc update.
Diffstat (limited to 'files/.vimrc')
-rw-r--r--files/.vimrc32
1 files changed, 27 insertions, 5 deletions
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()