Merge branch 'master' of ssh://jonfu.com/home/jon/dots

vim/.vimrc

@@ -6,6 +6,7 @@ set encoding=utf-8
 let mapleader=","
 set nu
 set laststatus=2
+set showtabline=2
 set hidden
 set incsearch
 
@@ -50,11 +51,23 @@ nnoremap <C-j> <C-W><C-J>
 nnoremap <C-k> <C-W><C-K>
 nnoremap <C-l> <C-W><C-L>
 nnoremap <C-h> <C-W><C-H>
+<<<<<<< HEAD
 " use jj to escape insert mode 
 inoremap jj <Esc>
 inoremap jk <Esc>
 inoremap kj <Esc>
 nnoremap <CR> o<Esc>
+=======
+" use jk to escape insert mode - using easyescape plugin 
+let g:easyescape_chars = { "j": 1, "k": 1 }
+let g:easyescape_timeout = 100
+cnoremap jk <ESC>
+cnoremap kj <ESC>
+
+" blank lines
+nnoremap <Enter> o<ESC>
+nnoremap <S-Enter> O<ESC>
+>>>>>>> 8339691402a347f81d8e7896e8acfc8cebca7ddf
 
 nnoremap <leader>l :ls<CR>:b<Space>
 nnoremap <Tab> :bnext<CR>
@@ -77,19 +90,52 @@ Plugin 'VundleVim/Vundle.vim'
 Plugin 'tpope/vim-fugitive'
 Plugin 'kien/ctrlp.vim'
 Plugin 'scrooloose/nerdtree'
+"Plugin 'fholgado/minibufexpl.vim'
 Plugin 'tmhedberg/SimpylFold'
 Plugin 'vim-scripts/indentpython.vim'
 Plugin 'scrooloose/syntastic'
 " PEP8 checking plugin
 Plugin 'nvie/vim-flake8'
-"Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
 Plugin 'itchyny/lightline.vim'
+Plugin 'taohex/lightline-buffer'
 "Plugin 'klen/python-mode'
 Plugin 'itchyny/calendar.vim'
 Plugin 'davidhalter/jedi-vim'
 Plugin 'tpope/vim-surround'
+<<<<<<< HEAD
 Plugin 'ap/vim-buftabline'
 Plugin 'wellle/targets.vim'
+=======
+Plugin 'junegunn/goyo.vim'
+Plugin 'zhou13/vim-easyescape'
+>>>>>>> 8339691402a347f81d8e7896e8acfc8cebca7ddf
 
 call vundle#end()            " required
 filetype plugin indent on    " required
+
+" use lightline-buffer in lightline
+let g:lightline = {
+    \ 'tabline': {
+    \   'left': [ [ 'bufferinfo' ],
+    \             [ 'separator' ],
+    \             [ 'bufferbefore', 'buffercurrent', 'bufferafter' ], ],
+    \   'right': [ [ 'close' ], ],
+    \ },
+    \ 'component_expand': {
+    \   'buffercurrent': 'lightline#buffer#buffercurrent',
+    \   'bufferbefore': 'lightline#buffer#bufferbefore',
+    \   'bufferafter': 'lightline#buffer#bufferafter',
+    \ },
+    \ 'component_type': {
+    \   'buffercurrent': 'tabsel',
+    \   'bufferbefore': 'raw',
+    \   'bufferafter': 'raw',
+    \ },
+    \ 'component_function': {
+    \   'bufferinfo': 'lightline#buffer#bufferinfo',
+    \ },
+    \ 'component': {
+    \   'separator': '',
+    \ },
+    \ }
+