From 0b146ced1e56a0d1d5092448f57dc0e19bddb5cb Mon Sep 17 00:00:00 2001
From: Robert Günzler <r@gnzler.io>
Date: Fri, 10 Apr 2020 14:27:52 +0200
Subject: vim: cleanup goyo/limelight integration

---
 .vim/after/plugin/writing.vim | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/.vim/after/plugin/writing.vim b/.vim/after/plugin/writing.vim
index d868304..a016316 100644
--- a/.vim/after/plugin/writing.vim
+++ b/.vim/after/plugin/writing.vim
@@ -9,19 +9,23 @@ let g:goyo_height = 90
 let g:goyo_linenr = 0
 nmap <F0> :Goyo<CR>
 
+let g:limelight_conceal_ctermfg = 'gray'
+let g:limelight_conceal_ctermbg = 'none'
+let g:limelight_conceal_guifg = 'gray'
+let g:limelight_conceal_guibg = 'none'
+
 let g:limelight_default_coefficient = 0.5
 let g:limelight_paragraph_span = 1
-" let g:limelight_default_coefficient = 0.5
-" let g:limelight_paragraph_span = 1
 let g:limelight_priority = -1
 
 " goyo enter/leave funcs {{{
 function! s:goyo_enter()
     if has('gui_running') || has('gui_vimr')
         " set linespace = 7
-
-    elseif exists('$TMUX')
+    end
+    if executable('tmux') && strlen($TMUX)
         silent !tmux set status off
+        silent !tmux list-panes -F '\#F' | grep -q Z || tmux resize-pane -Z
     endif
 
     " set noshowmode
@@ -30,18 +34,19 @@ function! s:goyo_enter()
     Limelight
 
     " make sure :q in the last buffer, in Goyo also quits vim
-    let b:quitting = 0
-    let b:quitting_bang = 0
-    autocmd QuitPre <buffer> let b:quitting = 1
-    cabbrev <buffer> q! let b:quitting_bang = 1 <bar> q!
+    " let b:quitting = 0
+    " let b:quitting_bang = 0
+    " autocmd QuitPre <buffer> let b:quitting = 1
+    " cabbrev <buffer> q! let b:quitting_bang = 1 <bar> q!
 endfunction
 
 function! s:goyo_leave()
     if has('gui_running') || has('gui_vimr')
         " set linespace = 0
-
-    elseif exists('$TMUX')
+    endif
+    if executable('tmux') && strlen($TMUX)
         silent !tmux set status on
+        silent !tmux list-panes -F '\#F' | grep -q Z || tmux resize-pane -Z
     endif
 
     " set showmode
@@ -50,13 +55,15 @@ function! s:goyo_leave()
     Limelight!
 
     " make sure :q in the last buffer, in Goyo also quits vim
-    if b:quitting && len(filter(range(1, bufnr('$')), 'buflisted(v:val)')) == 1
-        if b:quitting_bang
-          qa!
-        else
-          qa
-        endif
-    endif
+    " if b:quitting && len(filter(range(1, bufnr('$')), 'buflisted(v:val)')) == 1
+    "     if b:quitting_bang
+    "       qa!
+    "     else
+    "       qa
+    "     endif
+    " endif
+
+    hi SignColumn guibg=none ctermbg=none
 endfunction
 " }}}
 
-- 
cgit 1.4.1