From df022d080dacefa45d38f98ce9e8436cde4b58ea Mon Sep 17 00:00:00 2001
From: Tyrel Souza <tyrel@addgene.org>
Date: Fri, 19 Feb 2016 10:18:14 -0500
Subject: [PATCH] bunch of fixes

---
 vimrc | 43 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/vimrc b/vimrc
index 16a342c..98457c0 100644
--- a/vimrc
+++ b/vimrc
@@ -3,6 +3,7 @@
 set nocompatible
 
 syntax on
+syntax enable
 colorscheme monokai
 
 " Leader
@@ -19,10 +20,7 @@ set incsearch     " do incremental searching
 set laststatus=2  " Always display the status line
 set autowrite     " Automatically :write before running commands
 " Softtabs, 4 spaces
-set tabstop=4
-set shiftwidth=4
-set shiftround
-set expandtab
+set tabstop=4 softtabstop=0 expandtab shiftwidth=4 shiftround
 " Make it obvious where 80 characters is
 set textwidth=80
 set colorcolumn=+1
@@ -44,11 +42,19 @@ nnoremap <C-l> <C-w>l
 " Switch between the last two files
 nnoremap <leader><leader> <c-^>
 
+" Easier tab changing
+nnoremap rr :tabprevious<CR>
+nnoremap tt :tabnext<CR>
+nnoremap <C-t>  :tabnew<CR>
+
 " configure syntastic syntax checking to check on open as well as save
 let g:syntastic_check_on_open=1
 let g:syntastic_html_tidy_ignore_errors=[" proprietary attribute \"ng-"]
 " Fix for airline fonts
 let g:airline_powerline_fonts = 1
+let g:airline#extensions#tabline#enabled = 1
+let g:airline_theme='base16'
+let g:tmuxline_powerline_separators = 0
 " Treat <li> and <p> tags like the block tags they are
 let g:html_indent_tags = 'li\|p'
 
@@ -90,9 +96,34 @@ if executable('ag')
   let g:ctrlp_use_caching = 0
 endif
 
+
+nmap <silent> <F1> :set invnumber<CR>
+"NerdTree, show if open vim without file
+autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
+nmap <C-n> :NERDTreeToggle<CR>
+
+
+
+autocmd BufWinLeave *.* mkview
+autocmd BufWinEnter *.* silent loadview
+
+autocmd StdinReadPre * let s:std_in=1
+
+autocmd FileType go setlocal shiftwidth=8 tabstop=8
+
+filetype plugin on
+
+" Highlight
+let g:go_disable_autoinstall = 0
+let g:go_highlight_functions = 1
+let g:go_highlight_methods = 1
+let g:go_highlight_structs = 1
+let g:go_highlight_operators = 1
+let g:go_highlight_build_constraints = 1
+
+
+
 " Local config
 if filereadable($HOME . "/.vimrc.local")
   source ~/.vimrc.local
 endif
-
-