From f89c135ebc096beb22cf615bbc8bd88b455bebca Mon Sep 17 00:00:00 2001
From: "Eric D. Rohler" <edrohler@ericrohler.com>
Date: Wed, 17 Oct 2018 22:15:07 -0400
Subject: [PATCH] update vimrc and add tmux config

---
 .tmux.conf |  9 +++++++++
 .vimrc     | 21 +++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 .tmux.conf

diff --git a/.tmux.conf b/.tmux.conf
new file mode 100644
index 0000000..54f580e
--- /dev/null
+++ b/.tmux.conf
@@ -0,0 +1,9 @@
+bind-key V split-window -h
+bind-key H split-window -v
+bind r source-file ~/.tmux.conf \; display "Reloading Config"
+set -g base-index 1
+
+set-option -sg escape-time 10
+set-option -g default-terminal "screen-256color"
+
+source "/usr/share/tmux/powerline.conf"
diff --git a/.vimrc b/.vimrc
index 94b94b4..592aeb1 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,3 +1,6 @@
+" disable compatability
+set nocompatible
+
 " enable syntax highlighting
 syntax enable
 
@@ -24,6 +27,9 @@ set showmatch
 
 " enable all Python syntax highlighting features
 let python_highlight_all = 1
+autocmd FileType python set sw=4
+autocmd FileType python set ts=4
+autocmd FileType python set sts=4
 
 " Spell Checking
 set spell spelllang=en_us
@@ -43,9 +49,9 @@ Plug 'airblade/vim-gitgutter'
 if has('nvim')
 	Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
 else
-	Plug 'Shougo/deoplete.nvim'
-	Plug 'roxma/nvim-yarp'
-	Plug 'roxma/vim-hug-neovim-rpc'
+   Plug 'Shougo/deoplete.nvim'
+   Plug 'roxma/nvim-yarp'
+   Plug 'roxma/vim-hug-neovim-rpc'
 endif
 
 " Terminal Utils
@@ -57,6 +63,9 @@ Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' }
 Plug 'vim-ruby/vim-ruby'
 Plug 'OmniSharp/omnisharp-vim' " C#
 
+" Frameworks
+Plug 'tpope/vim-rails'
+
 " Snippets
 Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
 
@@ -90,12 +99,12 @@ let g:syntastic_always_populate_loc_list = 1
 let g:syntastic_auto_loc_list = 1
 let g:syntastic_check_on_open = 1
 let g:syntastic_check_on_wq = 0
-
+let g:python_host_prog = '/home/eric/.pyenv/versions/nvimpy2/bin/python'
+let g:python3_host_prog = '/home/eric/.pyenv/versions/nvimpy3/bin/python'
 let g:deoplete#enable_at_startup = 1
 
 let mapleder = ','
 
-
 map <C-f> :NERDTreeToggle<CR>
 nnoremap <C-p> :<C-u>FZF<CR>
-inoremap jk <Esc>
\ No newline at end of file
+inoremap jk <Esc>