Tidy up vimrc

vimrc.symlink

@@ -32,6 +32,8 @@ Plug 'vim-syntastic/syntastic'
 Plug 'altercation/vim-colors-solarized'
 Plug 'godlygeek/tabular' " Align text on symbols
 Plug 'szw/vim-tags' , { 'for' : 'php' } " tags support
+Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } " fuzzy file finder
+Plug 'airblade/vim-gitgutter' " git status in gutter column
 
 " html / templates
 Plug 'mattn/emmet-vim', { 'for': ['html', 'php', 'gohtmltmpl', 'vue'] } " emmet support for vim - easily create markdup wth CSS-like syntax
@@ -52,7 +54,8 @@ Plug 'posva/vim-vue', { 'for': [ 'javascript', 'html', 'vue' ] } " vue.js integr
 Plug 'fatih/vim-go', { 'for': [ 'go', 'html', 'gohtmltmpl' ], 'do': ':GoInstallBinaries' } " go support
 
 " LaTeX
-Plug 'LaTeX-Box-Team/LaTeX-Box', { 'for': 'tex' }
+"Plug 'LaTeX-Box-Team/LaTeX-Box', { 'for': 'tex' }
+Plug 'lervag/vimtex', { 'for': 'tex' }
 
 " Markdown
 Plug 'suan/vim-instant-markdown', { 'for': 'markdown' }
@@ -72,10 +75,6 @@ Plug 'nbouscal/vim-stylish-haskell', { 'for': 'haskell' }
 Plug 'Rip-Rip/clang_complete', { 'for': ['c', 'cpp'], 'do': 'make install' }
 let g:clang_library_path='/usr/lib/llvm-4.0/lib/libclang-4.0.so.1'
 
-" C#
-"Plug 'OmniSharp/omnisharp-vim', { 'for': 'cs' }
-"let g:OmniSharp_server_type = 'roslyn'
-
 " PHP
 Plug 'shawncplus/phpcomplete.vim', { 'for': 'php', 'do': 'curl -Ss http://vim-php.com/phpctags/install/phpctags.phar > ~/bin/phpctags && chmod +x ~/bin/phpctags' }
 
@@ -85,20 +84,18 @@ call plug#end()            " required
 filetype plugin indent on    " required
 " }}}
 
-" To ignore plugin indent changes, instead use:
-"filetype plugin on
-set wildignore+=node_modules
-
-" T H E M E
+" THEME{{{
 colorscheme solarized
-set background=dark
+set background=dark"
+" }}}
 
-" S E T T I N G S
+" SETTINGS{{{
 set number
 set autoread
 set colorcolumn=80
 
 set history=1000
+set wildignore+=node_modules
 
 " make comments and HTML attributes italic
 highlight Comment cterm=italic
@@ -129,18 +126,35 @@ set shell=$SHELL
 set cmdheight=1             " command bar height
 set title                   " set terminal title
 
-" scroll the viewport faster
-nnoremap <C-e> 3<C-e>
-nnoremap <C-y> 3<C-y>
-
 " Uncomment the following to have Vim jump to the last position when
 " reopening a file
 if has("autocmd")
     au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
                 \| exe "normal! g'\"" | endif
 endif
+" }}}
 
-" P L U G I N S
+" MAPPINGS{{{
+let mapleader = ","
+" CtrlP for Tags
+nnoremap <leader><C-p> :CtrlPTag<cr>
+
+" Toggle NERDTree
+nmap <silent> <leader>k :NERDTreeToggle<cr>
+" expand to the path of the file in the current buffer
+nmap <silent> <leader>y :NERDTreeFind<cr>
+" Allow saving of files as sudo when I forgot to start vim using sudo.
+cmap w!! w !sudo tee > /dev/null %
+"Toggle set paste
+nmap <leader>tp :set paste!<cr>
+" scroll the viewport faster
+nnoremap <C-e> 3<C-e>
+nnoremap <C-y> 3<C-y>
+" ctrl-r in visual mode to replace selected text
+vnoremap <C-r> "hy:%s/<C-r>h//g<left><left>
+"}}}
+
+" P L U G I N S{{{
 
 let NERDTreeShowHidden=1
 
@@ -155,23 +169,10 @@ set statusline+=%#warningmsg#
 set statusline+=%{SyntasticStatuslineFlag()}
 set statusline+=%*
 
-let vim_tags_ctags_binary='~/bin/phpctags'
-
-" M A P P I N G S
-let mapleader = ","
-" CtrlP for Tags
-nnoremap <leader><C-p> :CtrlPTag<cr>
-
-" Toggle NERDTree
-nmap <silent> <leader>k :NERDTreeToggle<cr>
-" expand to the path of the file in the current buffer
-nmap <silent> <leader>y :NERDTreeFind<cr>
-" Allow saving of files as sudo when I forgot to start vim using sudo.
-cmap w!! w !sudo tee > /dev/null %
-"Toggle set paste
-nmap <leader>tp :set paste!<cr>
+let vim_tags_ctags_binary='~/bin/phpctags'"
+"}}}
 
-" N E O C O M P L E T E 
+" N E O C O M P L E T E {{{
 "Note: This option must be set in .vimrc(_vimrc).  NOT IN .gvimrc(_gvimrc)!
 " Disable AutoComplPop.
 let g:acp_enableAtStartup = 0
@@ -261,5 +262,6 @@ if has('conceal')
     set conceallevel=2 concealcursor=niv
 endif
 let g:neosnippet#snippets_directory = '~/.dotfiles/vim/neosnippets'
+"}}}
 
-set foldmethod=marker
+set foldmethod=marker"