3 files changed, 8 insertions, 9 deletions

diff --git a/vim/init/config.vim b/vim/init/config.vim
index 368be25..e4403fb 100644
--- a/vim/init/config.vim
+++ b/vim/init/config.vim
@@ -17,14 +17,13 @@ augroup END
 augroup TerminalSize
   au!
   function! LayoutForSmallTerminal(bound)
-    let l:bound = a:bound ? a:bound : 20
-    if &lines < l:bound || g:alacritty_extra_padding
-      silent! set cmdheight=0 laststatus=0 showtabline=0 signcolumn=no nowrap scrolloff=1
+    if &lines < a:bound || g:alacritty_extra_padding
+      silent! set cmdheight=0 laststatus=0 showtabline=0 nowrap scrolloff=1
     else
-      silent! set cmdheight& laststatus& showtabline=2 signcolumn=yes scrolloff=3
+      silent! set cmdheight& laststatus& showtabline=2 scrolloff=3
     endif
   endfunc
-  autocmd VimEnter,VimResized * silent call LayoutForSmallTerminal(0)
+  autocmd VimEnter,VimResized * silent call LayoutForSmallTerminal(20)
 augroup END
 
 " }}}
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index 7921693..d94e7c0 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -53,8 +53,9 @@ function! ToggleWinPadding()
   if g:alacritty_extra_padding
     !alacritty msg config --window-id $WINDOWID --reset
   else
-    redir => output | hi SignColumn | redir END
+    redir => output | hi LineNr | redir END
     let bg_color = matchstr(output, 'guibg=\zs[^\s]\+\ze')
+    exe "hi EndOfBuffer guifg="..bg_color.." guibg="..bg_color
     exe "!alacritty msg config --window-id $WINDOWID window.padding.x=300 'colors.primary.background=\"\\"..bg_color.."\"'"
   endif
 
@@ -439,6 +440,7 @@ endfunc
 nnoremap <leader><leader>fm :<C-\>e'set foldmethod='..&foldmethod<CR>
 nnoremap <leader><leader>fc :<C-\>e'set foldcolumn='..&foldcolumn<CR>
 
+" Toggle fold and foldcolumn
 nnoremap <expr> zi "zizz:silent set foldcolumn="..(&foldenable ? "0" : "auto:3").."\<CR>"
 
 " Show fold level when it changes
diff --git a/vim/mini.lua b/vim/mini.lua
index 115fd27..7a5bcf8 100644
--- a/vim/mini.lua
+++ b/vim/mini.lua
@@ -785,7 +785,6 @@ require("mini.misc").setup({
 })
 vim.keymap.set( 'n', '<leader>Z', function()
   zoom()
-  vim.cmd("silent! call ToggleWinPadding()")
 end, { buffer = bufnr, desc = 'zoom' })
 --}}}
 -- mini.extra {{{
@@ -912,10 +911,9 @@ require("mini.visits").setup()
 -- mini.surround {{{
 require("mini.surround").setup {
   mappings = {
-    add = 'sa'
+    add = 's'
   }
 }
-vim.keymap.set('v', 's', 'sa', {})
 -- }}}
 -- mini.indentscope {{{
 require("mini.indentscope").setup()