From 0ca8b7205bbe33b4b05dcff4f54741dff7792bf0 Mon Sep 17 00:00:00 2001
From: Tyrel Souza <tyrelsouza@gmail.com>
Date: Fri, 19 Feb 2016 07:55:39 -0500
Subject: [PATCH] fix some more vimrc stuff

---
 vim/.netrwhist | 10 +------
 vimrc          | 80 +++++++++++++++++++++++---------------------------
 2 files changed, 37 insertions(+), 53 deletions(-)

diff --git a/vim/.netrwhist b/vim/.netrwhist
index ee96c49..7771a52 100644
--- a/vim/.netrwhist
+++ b/vim/.netrwhist
@@ -1,10 +1,2 @@
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =8
-let g:netrw_dirhist_1='/Library/StartupItems/SpoofMAC'
-let g:netrw_dirhist_2='/Users/tsouza'
-let g:netrw_dirhist_3='/Users/tsouza/RubymineProjects/roadmap/.git'
-let g:netrw_dirhist_4='/Users/tsouza/.ssh'
-let g:netrw_dirhist_5='/Users/tsouza/code/sshui'
-let g:netrw_dirhist_6='/Users/tsouza/.oh-my-zsh'
-let g:netrw_dirhist_7='/Users/tsouza/PycharmProjects/addgene-core'
-let g:netrw_dirhist_8='/Users/tsouza/.ssh'
+let g:netrw_dirhist_cnt =0
diff --git a/vimrc b/vimrc
index c97f17b..16a342c 100644
--- a/vimrc
+++ b/vimrc
@@ -1,6 +1,8 @@
 " Use Vim settings, rather then Vi settings. This setting must be as early as
 " possible, as it has side effects.
 set nocompatible
+
+syntax on
 colorscheme monokai
 
 " Leader
@@ -16,10 +18,41 @@ set showcmd       " display incomplete commands
 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
+" Make it obvious where 80 characters is
+set textwidth=80
+set colorcolumn=+1
+" Numbers
+set number
+set numberwidth=4
+" Allow pasting and not auto formatting
+set paste
+
+" Open new split panes to right and bottom, which feels more natural
+set splitbelow
+set splitright
+
+" Quicker window movement
+nnoremap <C-j> <C-w>j
+nnoremap <C-k> <C-w>k
+nnoremap <C-h> <C-w>h
+nnoremap <C-l> <C-w>l
+" Switch between the last two files
+nnoremap <leader><leader> <c-^>
+
+" 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
+" Treat <li> and <p> tags like the block tags they are
+let g:html_indent_tags = 'li\|p'
+
 
-" Switch syntax highlighting on, when the terminal has colors
-" Also switch on highlighting the last used search pattern.
-syntax on
 
 if filereadable(expand("~/.vimrc.bundles"))
   source ~/.vimrc.bundles
@@ -45,13 +78,6 @@ augroup vimrcEx
   autocmd FileType css,scss,sass setlocal iskeyword+=-
 augroup END
 
-" Softtabs, 2 spaces
-set tabstop=4
-set shiftwidth=4
-set shiftround
-set expandtab
-
-
 " Use The Silver Searcher https://github.com/ggreer/the_silver_searcher
 if executable('ag')
   " Use Ag over Grep
@@ -64,43 +90,9 @@ if executable('ag')
   let g:ctrlp_use_caching = 0
 endif
 
-" Make it obvious where 80 characters is
-set textwidth=80
-set colorcolumn=+1
-
-" Numbers
-set number
-set numberwidth=4
-
-" Switch between the last two files
-nnoremap <leader><leader> <c-^>
-
-" Run commands that require an interactive shell
-nnoremap <Leader>r :RunInInteractiveShell<space>
-
-" Treat <li> and <p> tags like the block tags they are
-let g:html_indent_tags = 'li\|p'
-
-" Open new split panes to right and bottom, which feels more natural
-set splitbelow
-set splitright
-
-" Quicker window movement
-nnoremap <C-j> <C-w>j
-nnoremap <C-k> <C-w>k
-nnoremap <C-h> <C-w>h
-nnoremap <C-l> <C-w>l
-
-" 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-"]
-
 " Local config
 if filereadable($HOME . "/.vimrc.local")
   source ~/.vimrc.local
 endif
-" Fix for airline fonts
-let g:airline_powerline_fonts = 1
 
-set paste