From c0b0d685e3dad63c352b7d98dfd1245a04c16ff5 Mon Sep 17 00:00:00 2001
From: Matthew Faltys <mfaltys@gmail.com>
Date: Mon, 18 Apr 2016 12:07:28 -0500
Subject: [PATCH] Add updated vimrc file with neovim changes.

The new vimrc file has updated plugins that I use regularly along with
some new keybinds.

* update with neovim plugins
* update with neovim keybinds
---
 vimrc | 82 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 64 insertions(+), 18 deletions(-)

diff --git a/vimrc b/vimrc
index d9c6ee4..f512cca 100644
--- a/vimrc
+++ b/vimrc
@@ -11,6 +11,13 @@ Plugin 'VundleVim/Vundle.vim'
 Plugin 'scrooloose/nerdtree'
 Plugin 'kien/ctrlp.vim'
 Plugin 'fatih/vim-go'
+Plugin 'christoomey/vim-tmux-navigator'
+Plugin 'shougo/vinarise'
+Plugin 'tpope/vim-fugitive'
+Plugin 'benekastah/neomake'
+
+Plugin 'airblade/vim-gitgutter'
+"Bundle 'christoomey/vim-tmux-navigator'
 
 call vundle#end()
 filetype plugin indent on
@@ -20,7 +27,8 @@ filetype plugin indent on
 "------NORMAL CONFIGS------
 colorscheme cottonmouse
 "colorscheme jellybeans
-command Mouse set mouse=a
+"command Mouse set mouse=a
+set mouse=
 syntax enable
 au BufRead,BufNewFile *.hy set filetype=hy
 "filetype plugin indent on
@@ -30,9 +38,34 @@ set cursorline
 " tabformatting...
 "set listchars=tab:\|\ 
 "set list
+hi LineNr ctermbg=NONE
+hi LineNr ctermfg=DarkGrey
+"
+set tabstop=4
+set shiftwidth=4
+"set expandtab
+
+autocmd Filetype html call SetHtmlOptions()
+function SetHtmlOptions()
+  setlocal ts=2 sts=2 sw=2
+  setlocal expandtab
+  "setlocal foldmethod=syntax
+  setlocal foldmethod=indent
+endfunction
+
+autocmd Filetype css setlocal ts=2 sts=2 sw=2
+autocmd Filetype gitcommit setlocal spell textwidth=72
 "------/NORMAL CONFIGS-----
 
 
+"------VIM KEYBIND CONFIGS-------
+nnoremap <c-j> <c-w>j
+nnoremap <c-k> <c-w>k
+nnoremap <c-h> <c-w>h
+nnoremap <c-l> <c-w>l
+"------/VIM KEYBIND CONFIGS------
+
+
 "------GO-VIM CONFIGS------
 let g:go_fmt_fail_silently = 1
 "let g:go_fmt_autosave = 0
@@ -44,21 +77,34 @@ hi LineNr ctermbg=NONE
 hi LineNr ctermfg=DarkGrey
 "------/COLOR CONFIGS-----
 
+"------ TERMINAL CONFIGS------
+:au BufEnter * if &buftype == 'terminal' | :startinsert | endif
+":tnoremap <A-h> <C-\><C-n><C-w>h
+":tnoremap <A-j> <C-\><C-n><C-w>j
+":tnoremap <A-k> <C-\><C-n><C-w>k
+":tnoremap <A-l> <C-\><C-n><C-w>l
+:nnoremap <A-h> <C-w>h
+:nnoremap <A-j> <C-w>j
+:nnoremap <A-k> <C-w>k
+:nnoremap <A-l> <C-w>l
+"------/TERMINAL CONFIGS-----
 
-"------STATUS LINE-------
-function Themeit()
-  set noshowmode
-  set noruler
-  set laststatus=2
-  set statusline=
-  set statusline=[%t]					" full filename
-  set statusline+=[%{''.(&fenc!=''?&fenc:&enc).''}]	" Encoding
-  set statusline+=%=					" right align
-  set statusline+=%14.([%l:%c%V]%)			" line and column
-  set statusline+=[%P\] 				" percentage of file
-  "set statusline+=\ 					" spaces
-  set statusline+=[%{strftime('%H:%M')}]		" time
-endfunction
-" now this only runs when we call 'themeblastr'
-command Themeblastr exec Themeit()
-"------/STATUS LINE------
+"" "------HEX MODE------
+"" " vim -b : edit binary using xxd-format!
+"" augroup Binary
+""   au!
+""   au BufReadPre  *.bin let &bin=1
+""   au BufReadPost *.bin if &bin | %!xxd
+""   au BufReadPost *.bin set ft=xxd | endif
+""   au BufWritePre *.bin if &bin | %!xxd -r
+""   au BufWritePre *.bin endif
+""   au BufWritePost *.bin if &bin | %!xxd
+""   au BufWritePost *.bin set nomod | endif
+"" augroup END
+"" "------/HEX MODE------
+
+
+"------NEOMAKE CONFIGS-----
+" this is the syntastic-like plugin
+autocmd! BufWritePost * Neomake
+"-----/NEOMAKE CONFIGS-----