Big cleanup of plugin config to make it more straightforward

Also added Goyo

vim/rc/plugins.rc.vim

@@ -15,118 +15,84 @@ endfunction
 " Navigation {{
 Plug 'file-line'
 Plug 'tpope/vim-vinegar'
-Plug 'sandeepcr529/Buffet.vim', { 'on': 'Bufferlist' }
+call s:smart_source_rc('plugins/Buffet')
-" Buffet {{
-nnoremap <silent> <F2> :Bufferlist<CR>
-" }} Buffet
 " }} Navigation
 
 " Git {{
-Plug 'tpope/vim-fugitive', { 'on': ['Gblame', 'Gdiff', 'Gcommit', 'Gstatus', 'Gwrite'] }
 call s:smart_source_rc('plugins/fugitive')
-Plug 'airblade/vim-gitgutter', { 'on': ['GitGutterSignsToggle'] }
 call s:smart_source_rc('plugins/gitgutter')
 " }} Git
 
-
 " Searching {{
-Plug 'ctrlpvim/ctrlp.vim'
 call s:smart_source_rc('plugins/ctrlp')
-Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': 'yes \| ./install' }
+call s:smart_source_rc('plugins/fzf')
-Plug 'junegunn/fzf.vim'
+call s:smart_source_rc('plugins/incsearch')
-let g:fzf_command_prefix = 'Fzf'
+call s:smart_source_rc('plugins/vim-grepper')
-Plug 'mhinz/vim-grepper'
+" }} Searching
-call s:smart_source_rc('plugins/grepper')
-" }} Fuzzy Find
 
 " Autocomplete {{
 call s:smart_source_rc('plugins/omnicompletion')
 if (has('lua') && (v:version > 703 || v:version == 703 && has('patch885')))
-    Plug 'Shougo/neocomplete.vim'
     call s:smart_source_rc('plugins/neocomplete')
 elseif has('nvim') && has('python3')
-    Plug 'Shougo/deoplete.nvim'
-    Plug 'Shougo/neoinclude.vim'
-    Plug 'Shougo/neco-syntax'
-    Plug 'zchee/deoplete-jedi'
-    Plug 'zchee/deoplete-go'
     call s:smart_source_rc('plugins/deoplete')
-    " Remember :UpdateRemotePlugins
 else
-    Plug 'Shougo/neocomplcache.vim'
     call s:smart_source_rc('plugins/neocomplcache')
 end
 " }} Autocomplete
 
 " Programming {{
-if has('nvim')
+Plug 'tpope/vim-surround'
-    Plug 'kassio/neoterm'
+call s:smart_source_rc('plugins/tagbar')
-endif
+call s:smart_source_rc('plugins/tcomment_vim')
-Plug 'majutsushi/tagbar'
-" tagbar {{
-nnoremap <silent> <F8> :TagbarToggle<CR>
-let g:tagbar_autofocus = 1 " Autofocus tagbar
-" }} tagbar
 if (v:version > 703)
     Plug 'ludovicchabant/vim-gutentags' " Auto generate tags files
 end
-Plug 'tpope/vim-surround'
+if has('nvim')
-Plug 'tomtom/tcomment_vim' " , { 'on': ['TComment', 'TCommentBlock'] }
+    Plug 'kassio/neoterm'
-" tcomment_vim {{
+else
-nnoremap // :TComment<CR>
-vnoremap // :TCommentBlock<CR>
-" }} tcomment_vim
-if !has('nvim')
     " Only use if not neovim, on neovim we have Neomake
-    Plug 'scrooloose/syntastic'
     call s:smart_source_rc('plugins/syntastic')
 endif
 " }}
 
 " GUI {{
-Plug 'mhinz/vim-startify'
+Plug 'gregsexton/MatchTag'
-call s:smart_source_rc('plugins/startify')
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
+call s:smart_source_rc('plugins/airline')
+call s:smart_source_rc('plugins/dash')
+call s:smart_source_rc('plugins/startify')
 " Plug 'edkolev/tmuxline.vim' " Removed because this can fail on some machines
 " let g:tmuxline_powerline_separators = 0
-call s:smart_source_rc('plugins/airline')
-" Highlight matching tags
-Plug 'gregsexton/MatchTag'
-" Integrate with Dash
-Plug 'rizzatti/dash.vim'
-" dash.vim {{
-nmap <silent> <leader>d <Plug>DashSearch
-let g:dash_map = {
-    \ 'apex' : 'apex',
-    \ 'visualforce' : 'vf',
-    \ }
-" }} dash.vim
 
 " }} GUI
 
 " Filetypes {{
+Plug 'ViViDboarder/force-vim', { 'for': ['apex', 'visualforce'] }
 Plug 'ViViDboarder/vim-forcedotcom'
 Plug 'avakhov/vim-yaml'
 Plug 'dag/vim-fish'
 Plug 'dart-lang/dart-vim-plugin'
+Plug 'fatih/vim-go'
 Plug 'groovy.vim'
 Plug 'hsanson/vim-android'
-Plug 'udalov/kotlin-vim'
 Plug 'pangloss/vim-javascript'
 Plug 'pdurbin/vim-tsv'
 Plug 'tfnico/vim-gradle'
 Plug 'tmux-plugins/vim-tmux'
-Plug 'fatih/vim-go'
+Plug 'udalov/kotlin-vim'
-" vim-go {
 let g:go_def_mapping_enabled = 0
-" }
 " }}
 
 " Python {{
 call s:smart_source_rc('plugins/python')
 " }}
 
+" if (v:version > 703)
+"     Plug 'Yggdroot/indentLine', { 'for': ['python', 'yaml'] }
+" endif
+
 " Themes {{
 Plug 'altercation/vim-colors-solarized'
 Plug 'candy.vim'
@@ -139,29 +105,22 @@ Plug 'therubymug/vim-pyte'
 Plug 'vividchalk.vim'
 Plug 'wombat256.vim'
 " }}
+call s:smart_source_rc('plugins/goyo-limelight') " Distraction free editing
 
 " System {{
+
 " neomake / vim-dispatch {{
 if has('nvim')
-    Plug 'benekastah/neomake'
+    call s:smart_source_rc('plugins/neomake')
-    nnoremap <F5> :Neomake<CR>
-    let g:neomake_python_enabled_makers = ['flake8']
-    command! TagsUpdate NeomakeSh ctags -R .
 else
-    Plug 'tpope/vim-dispatch'
+    call s:smart_source_rc('plugins/vim-dispatch')
-    nnoremap <F5> :Make<CR>
-    command! TagsUpdate Dispatch ctags -R .
 endif
 " }}
+"
 Plug 'Shougo/vimproc.vim', { 'do': 'make' }
 Plug 'tpope/vim-endwise'
 Plug 'tpope/vim-eunuch'
 Plug 'tpope/vim-repeat'
-" emacs bindinds in insert
+Plug 'tpope/vim-rsi' " emacs bindinds in insert
-Plug 'tpope/vim-rsi'
+call s:smart_source_rc('plugins/vim-togglelist')
-Plug 'milkypostman/vim-togglelist'
-" vim-togglelist {{
-nnoremap <silent> <F6> :call ToggleQuickfixList()<CR>
-nnoremap <silent> <F7> :call ToggleLocationList()<CR>
-" }} vim-togglelist
 " }}

vim/rc/plugins/buffet.rc.vim

@@ -0,0 +1,2 @@
+Plug 'sandeepcr529/Buffet.vim', { 'on': 'Bufferlist' }
+nnoremap <silent> <F2> :Bufferlist<CR>

vim/rc/plugins/ctrlp.rc.vim

@@ -1,3 +1,4 @@
+Plug 'ctrlpvim/ctrlp.vim'
 " Configuration for ctrlp.vim
 
 " Ensure max height isn't too large. (for performance)

vim/rc/plugins/dash.rc.vim

@@ -0,0 +1,8 @@
+" Install plugin
+Plug 'rizzatti/dash.vim'
+" Set config"
+nmap <silent> <leader>d <Plug>DashSearch
+let g:dash_map = {
+    \ 'apex' : 'apex',
+    \ 'visualforce' : 'vf',
+    \ }

vim/rc/plugins/deoplete.rc.vim

@@ -1,3 +1,10 @@
+" Install plugins
+Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
+Plug 'Shougo/neoinclude.vim'
+Plug 'Shougo/neco-syntax'
+Plug 'zchee/deoplete-jedi'
+Plug 'zchee/deoplete-go'
+
 inoremap <silent><expr> <C-Space> pumvisible() ? "\<C-n>" : deoplete#mappings#manual_complete()
 inoremap <silent><expr> <nul> pumvisible() ? "\<C-n>" : deoplete#mappings#manual_complete()
 

vim/rc/plugins/fugitive.rc.vim

@@ -1,3 +1,4 @@
+Plug 'tpope/vim-fugitive' ", { 'on': ['Gblame', 'Gdiff', 'Gcommit', 'Gstatus', 'Gwrite'] }
 " Mappings
 nnoremap <leader>gb :Gblame<CR>
 nnoremap <leader>gc :Gcommit<CR>

vim/rc/plugins/fzf.rc.vim

@@ -0,0 +1,3 @@
+Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': 'yes \| ./install' }
+Plug 'junegunn/fzf.vim'
+let g:fzf_command_prefix = 'Fzf'

vim/rc/plugins/gitgutter.rc.vim

@@ -1,3 +1,4 @@
+Plug 'airblade/vim-gitgutter', { 'on': ['GitGutterSignsToggle'] }
 " Settings to keep gitgutter fast
 let g:gitgutter_enabled = 1
 " Will toggle signs when I want them

vim/rc/plugins/goyo-limelight.rc.vim

@@ -0,0 +1,11 @@
+" Both these plugins work well together for distraction free editing
+Plug 'junegunn/goyo.vim', { 'on': 'Goyo' }
+Plug 'junegunn/limelight.vim', { 'on': 'Limelight' }
+function! s:goyo_enter()
+    Limelight
+endfunction
+function! s:goyo_leave()
+    Limelight!
+endfunction
+autocmd! User GoyoEnter nested call <SID>goyo_enter()
+autocmd! User GoyoLeave nested call <SID>goyo_leave()

vim/rc/plugins/incsearch.rc.vim

@@ -0,0 +1,4 @@
+Plug 'haya14busa/incsearch.vim'
+map / <Plug>(incsearch-forward)
+map ? <Plug>(incsearch-backward)
+map g/ <Plug>(incsearch-stay)

vim/rc/plugins/neocomplcache.rc.vim

@@ -1,3 +1,7 @@
+" Install plugins
+Plug 'Shougo/neocomplcache.vim'
+
+" Set configuration
 let g:neocomplcache_enable_at_startup = 1
 let g:neocomplcache_enable_smart_case = 1
 let g:neocomplcache_max_list = 10

vim/rc/plugins/neocomplete.rc.vim

@@ -1,3 +1,7 @@
+" Install plugins
+Plug 'Shougo/neocomplete.vim'
+
+" Configure plugins
 let g:acp_enableAtStartup = 0
 let g:neocomplete#enable_at_startup = 1
 let g:neocomplete#enable_smart_case = 1

vim/rc/plugins/neomake.rc.vim

@@ -0,0 +1,4 @@
+Plug 'benekastah/neomake'
+nnoremap <F5> :Neomake<CR>
+let g:neomake_python_enabled_makers = ['flake8']
+command! TagsUpdate NeomakeSh ctags -R .

vim/rc/plugins/python.rc.vim

@@ -12,7 +12,7 @@ let g:jedi#auto_vim_configuration = 0
 let g:jedi#completions_enabled = 0
 let g:jedi#smart_auto_mappings = 0
 " }} jedi-vim
-Plug 'klen/python-mode'
+Plug 'klen/python-mode', { 'for': 'python' }
 " python-mode {{
 " A lot is disabled, what I'm using:
 "   breakpoints, virtualenv, motions, syntax,

vim/rc/plugins/startify.rc.vim

@@ -1,3 +1,4 @@
+Plug 'mhinz/vim-startify'
 let g:startify_list_order = [
     \ ['   My Bookmarks'], 'bookmarks',
     \ ['   Most recently used files in the current directory'], 'dir',

vim/rc/plugins/syntastic.rc.vim

@@ -1,3 +1,4 @@
+Plug 'scrooloose/syntastic'
 if exists('loaded_syntastic')
     let g:syntastic_html_tidy_ignore_errors = [
         \ 'proprietary attribute "ng-show"',

vim/rc/plugins/tagbar.rc.vim

@@ -0,0 +1,4 @@
+Plug 'majutsushi/tagbar'
+nnoremap <silent> <F8> :TagbarToggle<CR>
+let g:tagbar_autofocus = 1 " Autofocus tagbar
+

vim/rc/plugins/tcomment_vim.rc.vim

@@ -0,0 +1,3 @@
+Plug 'tomtom/tcomment_vim' " , { 'on': ['TComment', 'TCommentBlock'] }
+nnoremap // :TComment<CR>
+vnoremap // :TCommentBlock<CR>

vim/rc/plugins/vim-dispatch.rc.vim

@@ -0,0 +1,3 @@
+Plug 'tpope/vim-dispatch'
+nnoremap <F5> :Make<CR>
+command! TagsUpdate Dispatch ctags -R .

vim/rc/plugins/vim-grepper.rc.vim

@@ -1,3 +1,4 @@
+Plug 'mhinz/vim-grepper'
 " Grepper settings and shortcuts
 let g:grepper = {
             \ 'dispatch': 1,

vim/rc/plugins/vim-togglelist.rc.vim

@@ -0,0 +1,3 @@
+Plug 'milkypostman/vim-togglelist'
+nnoremap <silent> <F6> :call ToggleQuickfixList()<CR>
+nnoremap <silent> <F7> :call ToggleLocationList()<CR>