after/ftplugin/man.vim

@@ -1 +0,0 @@
-setlocal showbreak=

plugin/autocmds.vim

@@ -1,7 +1,7 @@
 augroup benieAugroup
   autocmd!
 
-  if tmux#inSession()
+  if $TMUX !=# ''
     " [Un]set tmux window option to detect when to change pane.
     call tmux#setNavigationFlag()
     au FocusGained * silent call tmux#setNavigationFlag()
@@ -28,20 +28,4 @@ augroup benieAugroup
 
   " Augment vim-signify by modifying it's autocmds
   au User SignifyAutocmds call do#signify()
-
-  if has('nvim')
-    " Start in terminal-insert mode.
-    autocmd TermOpen term://* startinsert
-    " Don't show the line number column in terminal-insert mode.
-    autocmd TermEnter term://* set nonumber | set norelativenumber
-    " But do show the line number column in terminal-normal mode.
-    autocmd TermLeave term://* set number | set relativenumber
-    " Automatically press enter when the terminal process exits.
-    autocmd TermClose term://*
-          \ if (expand('<afile>') !~ "fzf") &&
-          \    (expand('<afile>') !~ "ranger") &&
-          \    (expand('<afile>') !~ "coc") |
-          \   call nvim_input('<CR>') |
-          \ endif
-  endif
 augroup END

plugin/mappings.vim

@@ -5,11 +5,6 @@ nmap <leader>gt <Plug>(coc-type-definition)
 nmap <leader>sd <Plug>(coc-diagnostic-info)
 nmap <leader>gr <Plug>(coc-references)
 
-if has('nvim')
-  " Make nvim :terminal more like vim :terminal
-  tnoremap <C-w>N <C-\><C-n>
-endif
-
 " termdebug
 " TODO: Detecet if termdebug is loaded, if not do the default action.
 nnoremap <C-W><C-G> :Gdb<CR>
@@ -64,26 +59,14 @@ nnoremap k gk
 " Quick write
 nnoremap <leader>w :w!<CR>
 
-" Switch panes in a tmux aware way
+" Switch panes
-nnoremap <silent> <C-h> :TmuxNavigateLeft<CR>
+nnoremap <C-h> <C-w>h
-nnoremap <silent> <C-j> :TmuxNavigateDown<CR>
+nnoremap <C-j> <C-w>j
-nnoremap <silent> <C-k> :TmuxNavigateUp<CR>
+nnoremap <C-k> <C-w>k
-nnoremap <silent> <C-l> :TmuxNavigateRight<CR>
+nnoremap <C-l> <C-w>l
-nnoremap <silent> <C-w>h :TmuxNavigateLeft<CR>
+
-nnoremap <silent> <C-w>j :TmuxNavigateDown<CR>
+" Redraw window
-nnoremap <silent> <C-w>k :TmuxNavigateUp<CR>
+nnoremap <C-w>l <C-l>
-nnoremap <silent> <C-w>l :TmuxNavigateRight<CR>
-if has('nvim')
-  tnoremap <silent> <C-w>h <C-\><C-n>:TmuxNavigateLeft<CR>
-  tnoremap <silent> <C-w>j <C-\><C-n>:TmuxNavigateDown<CR>
-  tnoremap <silent> <C-w>k <C-\><C-n>:TmuxNavigateUp<CR>
-  tnoremap <silent> <C-w>l <C-\><C-n>:TmuxNavigateRight<CR>
-else
-  tnoremap <silent> h :TmuxNavigateLeft<CR>
-  tnoremap <silent> j :TmuxNavigateDown<CR>
-  tnoremap <silent> k :TmuxNavigateUp<CR>
-  tnoremap <silent> l :TmuxNavigateRight<CR>
-endif
 
 " Quick tabs
 nnoremap <leader>tn :tabnew<Space>

plugin/settings.vim

@@ -152,11 +152,7 @@ set formatoptions+=rq
 
 " Always show the signcolum
 if exists('&signcolumn')
-  try
+  set signcolumn=yes
-    set signcolumn=number
-  catch /E474/
-    set signcolumn=auto
-  endtry
 endif
 
 " Enable modeline

plugin/statusline.vim

@@ -98,8 +98,6 @@ function! statusline#active()
       let l:mode = 'Preview'
     endif
     return statusline#generic('StatusLineLight', l:mode)
-  elseif &filetype ==# 'man'
-    return statusline#special('StatusLineDusk', 'Manual', '%f')
   endif
   return statusline#generic('StatusLineLight', l:mode)
 endfunction
@@ -120,8 +118,6 @@ function! statusline#inactive()
     let l:statusline = statusline#special('StatusLineDusk', 'Terminal', '%f')
   elseif &previewwindow
     let l:statusline = statusline#generic('StatusLineDusk', 'Preview')
-  elseif &filetype ==# 'man'
-    let l:statusline = statusline#special('StatusLineDusk', 'Manual', '%f')
   else
     let l:statusline = statusline#generic('StatusLineDusk', 'Idle')
   endif
@@ -144,7 +140,7 @@ function! statusline#mode()
   \   's':  ['Select',   g:statusline#light_violet],
   \   'S':  ['S-Line',   g:statusline#light_violet],
   \   '': ['S-Block',  g:statusline#light_violet],
-  \   't':  ['Terminal', g:statusline#light_blue],
+  \   't':  ['Terminal', g:statusline#light_grey],
   \   '!':  ['Shell',    g:statusline#light_grey],
   \}[mode()]
   " Update the StatusLineLight color.

vimrc

@@ -125,7 +125,6 @@ let g:note_directory = '~/Sync/Notes'
 if !has('win32')
   " Seemless vim/tmux pane navigation
   Pack 'christoomey/vim-tmux-navigator'
-  let g:tmux_navigator_no_mappings = 1
   " Enable focus events when in tmux session
   Pack 'tmux-plugins/vim-tmux-focus-events'
 endif