New circular windows mapping

diff --git a/vimrc b/vimrc
index f5a2270fe562a2082635eb9a677ca56c51be5bc4..c50fe2175c8688fb5489c8d260c79c60a26f39e7 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -74,19 +74,19 @@ inoremap jk                       <Esc>
 xnoremap jk                       <Esc>
 cnoremap jk                       <C-c>
 
-" <Ctrl-hjkl> Jump windows
-noremap <C-h>                     <C-w><C-h>
-noremap <C-j>                     <C-w><C-j>
-noremap <C-k>                     <C-w><C-k>
-noremap <C-l>                     <C-w><C-l>
-tnoremap <C-j>                    <C-\><C-n><C-w>j
-tnoremap <C-k>                    <C-\><C-n><C-w>k
-tnoremap <C-l>                    <C-\><C-n><C-w>l
-tnoremap <C-h>                    <C-\><C-n><C-w>h
-
-" Vim command line 
-cnoremap <C-p>                    <Up>
-cnoremap <C-n>                    <Down>
+" Circular windows
+nnoremap <tab>                    <C-w>w
+nnoremap <S-tab>                  <C-w>W
+
+" Movement in insert mode
+inoremap <C-h>                    <C-o>h
+inoremap <C-l>                    <C-o>a
+inoremap <C-j>                    <C-o>j
+inoremap <C-k>                    <C-o>k
+
+" Movement in command mode
+cnoremap <C-j>                    <Down>
+cnoremap <C-k>                    <Up>
 cnoreabbrev w!!                   w !sudo tee "%"
 
 " Visual Mode indent
@@ -109,6 +109,7 @@ set breakindent
 set breakindent showbreak=\ +
 set shiftround
 set formatoptions+=j
+set nostartofline
 
 " searching
 set incsearch hlsearch
@@ -321,9 +322,7 @@ silent! packadd! fzf.vim
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 silent! packadd! indentLine
-"let g:indentLine_enabled = 1
-"let g:indentLine_setColors = 0
-"let g:indentLine_setConceal = 0
+let g:indentLine_enabled = 1
 autocmd! User indentLine doautocmd indentLine Syntax
 let g:indentLine_color_term = 239
 let g:indentLine_color_gui = '#616161'