From 06a46e5ff74c0f549dc1770baaea1567048221d0 Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc.local>
Date: Sat, 23 Dec 2017 10:32:26 -0600
Subject: [PATCH] Added some comments and jk to leave insert because I keep
 trying to use it

---
 vim/.vimrc | 39 +++++++++------------------------------
 1 file changed, 9 insertions(+), 30 deletions(-)

diff --git a/vim/.vimrc b/vim/.vimrc
index 30e1501..26d1235 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -8,10 +8,11 @@ set nu
 set laststatus=2
 set hidden
 set incsearch
+
 " hide showmode because its in statusline
 set noshowmode
 
-" Indent settings - this is for PEP8 compatibility
+" Indent settings - PEP8 compatibility
 set expandtab
 set autoindent
 set tabstop=4
@@ -30,7 +31,10 @@ set number relativenumber
 "set highlight cursorcolumn cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white
 nnoremap <Leader>c :set cursorline! cursorcolumn!<CR>
 
+"highlight matching brace when closing brace, flash for 2 tenths
 set showmatch
+set matchtime=2
+
 let pythong_highlight_all = 1
 syntax on
 
@@ -48,6 +52,7 @@ nnoremap <C-l> <C-W><C-L>
 nnoremap <C-h> <C-W><C-H>
 " use jj to escape insert mode 
 inoremap jj <Esc>
+inoremap jk <Esc>
 
 nnoremap <leader>l :ls<CR>:b<Space>
 nnoremap <Tab> :bnext<CR>
@@ -56,19 +61,17 @@ nnoremap <S-Tab> :bprev<CR>
 nnoremap <leader>p :CtrlPBuffer<CR>
 nnoremap <space> za
 
-
-" NERDTree
+" NERDTree, open/close toggle
 map <C-n> :NERDTreeToggle<CR>
 
-"airline - show buffers in the tabline if theres only one tab (always)
-let g:airline#extensions#tabline#enabled = 1
+"lightline colorscheme
+let g:lightline = {'colorscheme': 'powerline',}
 
 " 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 'kien/ctrlp.vim'
 Plugin 'scrooloose/nerdtree'
@@ -78,8 +81,6 @@ Plugin 'scrooloose/syntastic'
 " PEP8 checking plugin
 Plugin 'nvie/vim-flake8'
 "Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
-"Plugin 'vim-airline/vim-airline'
-"Plugin 'vim-airline/vim-airline-themes'
 Plugin 'itchyny/lightline.vim'
 "Plugin 'klen/python-mode'
 Plugin 'itchyny/calendar.vim'
@@ -88,25 +89,3 @@ Plugin 'tpope/vim-surround'
 
 call vundle#end()            " required
 filetype plugin indent on    " required
-
-" "
-" " Brief help
-" " :PluginList       - lists configured plugins
-" " :PluginInstall    - installs plugins; append `!` to update or just
-" :PluginUpdate
-" " :PluginSearch foo - searches for foo; append `!` to refresh local cache
-" " :PluginClean      - confirms removal of unused plugins; append `!` to
-" auto-approve removal
-" "
-" " see :h vundle for more details or wiki for FAQ
-" " Put your non-Plugin stuff after this line
-
-"python with virtualenv support
-"py << EOF
-"import os
-"import sys
-"if 'VIRTUAL_ENV' in os.environ:
-"    project_base_dir = os.environ['VIRTUAL_ENV']
-"    activate_this = os.path.join(project_base_dir, 'bin/activate_this.py')
-"    execfile(activate_this, dict(__file__=activate_this))
-"EOF