From 6941a4626a684100602a870c485724268ae1a118 Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Tue, 31 Mar 2015 13:48:21 -0700
Subject: [PATCH] Fix some neovim and tmux stuff

---
 vim/rc/plugins.rc.vim | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/vim/rc/plugins.rc.vim b/vim/rc/plugins.rc.vim
index 4219cfd..935f7cd 100644
--- a/vim/rc/plugins.rc.vim
+++ b/vim/rc/plugins.rc.vim
@@ -13,7 +13,7 @@ endfunction
 " Navigation {{
 Plug 'file-line'
 Plug 'tpope/vim-vinegar'
-Plug 'tpope/vim-fugitive', { 'on': ['Gblame', 'Gdiff', 'Gcommit', 'Gstatus', 'Gwrite'] }
+Plug 'tpope/vim-fugitive' " , { 'on': ['Gblame', 'Gdiff', 'Gcommit', 'Gstatus', 'Gwrite'] }
 " {{
     nnoremap <leader>gb :Gblame<CR>
     nnoremap <leader>gc :Gcommit<CR>
@@ -154,7 +154,7 @@ Plug 'rizzatti/dash.vim', { 'on': 'Dash'}
 " }}
 
 " Filetypes {{
-Plug 'PreserveNoEOL'
+" Plug 'PreserveNoEOL'
 " {{
     let g:PreserveNoEOL = 1
 " }}
@@ -167,6 +167,7 @@ Plug 'hsanson/vim-android'
 Plug 'pangloss/vim-javascript'
 Plug 'pdurbin/vim-tsv'
 Plug 'tfnico/vim-gradle'
+Plug 'tmux-plugins/vim-tmux'
 " }}
 
 " Python {{
@@ -207,20 +208,7 @@ Plug 'wombat256.vim'
 if has('nvim')
     Plug 'benekastah/neomake'
     " {{
-        let g:neomake_apex_force_maker = {
-            \ 'exe': 'force',
-            \ 'args': ['push'],
-            \ 'errorformat': &errorformat,
-            \ }
-
-        let g:neomake_apex_atf_maker = {
-            \ 'exe': 'atf deploy file',
-            \ 'args': [],
-            \ 'errorformat': &errorformat,
-            \ }
-
-        let g:neomake_apex_enabled_makers = ['force']
-        " let g:neomake_apex_enabled_makers = ['atf']
+        nmap <leader>nm :Neomake<CR>
         let g:neomake_python_makers = ['flake8']
     " }}
 else