diff --git a/vim/.vimrc b/vim/.vimrc index 9e36b7a..cd37d6a 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -68,9 +68,6 @@ nnoremap :Files inoremap jj inoremap jk inoremap kj -" use jk to escape insert mode - using easyescape plugin -let g:easyescape_chars = { "j": 1, "k": 1 } -let g:easyescape_timeout = 100 " blank lines nnoremap o @@ -86,32 +83,30 @@ nnoremap za map :NERDTreeToggle "lightline colorscheme -let g:lightline = {'colorscheme': 'wombat',} +let g:lightline = {'colorscheme': 'powerline',} "vim-jedi auto-select first, saves a keystroke let g:jedi#popup_select_first = 0 -" set the runtime path to include Vundle and initialize -set rtp+=~/.vim/bundle/Vundle.vim -call vundle#begin() -" " let Vundle manage Vundle, required -Plugin 'VundleVim/Vundle.vim' -Plugin 'tpope/vim-fugitive' -Plugin 'scrooloose/nerdtree' -Plugin 'tmhedberg/SimpylFold' -Plugin 'vim-scripts/indentpython.vim' -Plugin 'scrooloose/syntastic' -Plugin 'nvie/vim-flake8' " PEP 8 checking plugin -Plugin 'itchyny/lightline.vim' -Plugin 'klen/python-mode' -Plugin 'davidhalter/jedi-vim' -Plugin 'tpope/vim-surround' -Plugin 'ap/vim-buftabline' -Plugin 'wellle/targets.vim' -Plugin 'junegunn/goyo.vim' -Plugin 'zhou13/vim-easyescape' -Plugin 'junegunn/fzf.vim' -Plugin 'mcchrish/nnn.vim' +call plug#begin('~/.vim/plugged') " vim-plug + +Plug 'VundleVim/Vundle.vim' +Plug 'tpope/vim-fugitive' +Plug 'scrooloose/nerdtree' +Plug 'tmhedberg/SimpylFold' +Plug 'vim-scripts/indentpython.vim' +Plug 'scrooloose/syntastic' +Plug 'nvie/vim-flake8' " PEP 8 checking plugin +Plug 'itchyny/lightline.vim' +"Plug 'klen/python-mode' +Plug 'davidhalter/jedi-vim' +Plug 'tpope/vim-surround' +Plug 'ap/vim-buftabline' +Plug 'wellle/targets.vim' +Plug 'junegunn/goyo.vim' +Plug 'junegunn/fzf.vim' +Plug 'mcchrish/nnn.vim' + +call plug#end() " end vim-plug -call vundle#end() " required filetype plugin indent on " required