Switched from vundle to vim-plug. Cleaned up vimrc quite a bit.

vim/.vimrc

@@ -32,7 +32,7 @@ set cursorline
 "set colorcolumn=79
 
 "enable relative line numbers
-"set number relativenumber
+set number relativenumber
 
 "set highlight cursorcolumn cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white
 nnoremap <Leader>c :set cursorline! cursorcolumn!<CR>
@@ -44,6 +44,7 @@ nnoremap <silent><expr> <Leader>h (&hls && v:hlsearch ? ':nohls' : ':set hls')."
 set showmatch
 set matchtime=2
 
+" python-syntax
 let pythong_highlight_all = 1
 syntax on
 
@@ -60,17 +61,16 @@ nnoremap <C-k> <C-W><C-K>
 nnoremap <C-l> <C-W><C-L>
 nnoremap <C-h> <C-W><C-H>
 
-" use jj to escape insert mode 
+" map ctrl-p to fzf 
+nnoremap <C-p> :Files<CR>
+
+" use jj (et al) 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>
+let g:easyescape_timeout = 100
 
 " blank lines
 nnoremap <Enter> o<ESC>
@@ -80,21 +80,16 @@ nnoremap <leader>l :ls<CR>:b<Space>
 nnoremap <Tab> :bnext<CR>
 nnoremap <S-Tab> :bprev<CR>
 
-nnoremap <leader>p :CtrlPBuffer<CR>
 nnoremap <space> za
 
 " NERDTree, open/close toggle
 map <C-n> :NERDTreeToggle<CR>
 
 "lightline colorscheme
-let g:lightline = {'colorscheme': 'jellybeans',}
-
-"supertab setting
-"let g:SuperTabDefaultCompletionType = "context"
+let g:lightline = {'colorscheme': 'wombat',}
 
 "vim-jedi auto-select first, saves a keystroke
 let g:jedi#popup_select_first = 0
-let g:SuperTabCrMapping=1
 
 " set the runtime path to include Vundle and initialize
 set rtp+=~/.vim/bundle/Vundle.vim
@@ -102,52 +97,21 @@ call vundle#begin()
 " " let Vundle manage Vundle, required
 Plugin 'VundleVim/Vundle.vim'
 Plugin 'tpope/vim-fugitive'
-Plugin 'kien/ctrlp.vim'
 Plugin 'scrooloose/nerdtree'
 Plugin 'tmhedberg/SimpylFold'
-"Plugin 'vim-scripts/indentpython.vim'
+Plugin 'vim-scripts/indentpython.vim'
 Plugin 'scrooloose/syntastic'
-" PEP8 checking plugin
-Plugin 'nvie/vim-flake8'
+Plugin 'nvie/vim-flake8'    " PEP 8 checking plugin
 Plugin 'itchyny/lightline.vim'
-"requires login below
-"Plugin 'taohex/lightline-buffer'
-"Plugin 'klen/python-mode'
-"Plugin 'itchyny/calendar.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 'ervandew/supertab'
+Plugin 'junegunn/fzf.vim'
+Plugin 'mcchrish/nnn.vim'
 
 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': '',
-    \ },
-    \ }
-