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

bash/.bashrc

@@ -32,5 +32,11 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH
 export EDITOR=/usr/bin/vim
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
-xrdb -merge /home/jon/.colors/codeschool.dark
 
+#vi readline
+set -o vi
+#ctrl-x, ctrl-e to launch $EDITOR (vim)
+bind -m vi-insert '"\C-x\C-e": edit-and-execute-command'
+
+#fix clear screen in vi mode
+bind -m vi-insert "\C-l":clear-screen

tmux/.tmux.conf

@@ -1,3 +1,8 @@
+#remove escape delay
+set -s escape-time 0
+
+set -g default-terminal "rxvt-unicode-256color"
+
 #change C-b to Ca
 unbind C-b
 set-option -g prefix C-a
@@ -31,7 +36,9 @@ set -g mode-keys vi
 if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
     'set -g mouse on' \
     'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
-#    'set -g mouse on; set -g mouse-utf8 on' \
+
+set -g mouse on
+#'set -g mouse on; set -g mouse-utf8 on' \
 
 bind-key Tab last-window
 bind-key BTab previous-window

vim/.vim/.netrwhist

@@ -1,5 +1,7 @@
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =3
+let g:netrw_dirhist_cnt =5
 let g:netrw_dirhist_1='/home/jon'
 let g:netrw_dirhist_2='/home/jon/.gnome'
 let g:netrw_dirhist_3='/home/jon'
+let g:netrw_dirhist_4='/home/jon/dwm-6.1/.git'
+let g:netrw_dirhist_5='/etc/X11/xorg.conf.d'

vim/.vimrc

@@ -51,6 +51,13 @@ 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>
+
+" 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
@@ -72,7 +79,7 @@ nnoremap <space> za
 map <C-n> :NERDTreeToggle<CR>
 
 "lightline colorscheme
-let g:lightline = {'colorscheme': 'powerline',}
+let g:lightline = {'colorscheme': 'jellybeans',}
 
 " set the runtime path to include Vundle and initialize
 set rtp+=~/.vim/bundle/Vundle.vim
@@ -82,7 +89,6 @@ 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'
@@ -94,6 +100,8 @@ Plugin 'taohex/lightline-buffer'
 Plugin 'itchyny/calendar.vim'
 Plugin 'davidhalter/jedi-vim'
 Plugin 'tpope/vim-surround'
+Plugin 'ap/vim-buftabline'
+Plugin 'wellle/targets.vim'
 Plugin 'junegunn/goyo.vim'
 Plugin 'zhou13/vim-easyescape'