diff options
| author | Hsieh Chin Fan <pham@topo.tw> | 2024-07-30 21:06:31 +0800 |
|---|---|---|
| committer | Hsieh Chin Fan <pham@topo.tw> | 2024-07-30 21:06:31 +0800 |
| commit | e3bd49d53fcd0d356d7a5b621cf98f2bd0737ecb (patch) | |
| tree | 5441082586200ef4805cdfb2912f3c8f43847db7 /vim/init | |
| parent | 7479fe85169c38c543c57143dacae1275f9b10c9 (diff) | |
Update
Diffstat (limited to 'vim/init')
| -rw-r--r-- | vim/init/config.vim | 9 | ||||
| -rw-r--r-- | vim/init/keymaps.vim | 4 |
2 files changed, 7 insertions, 6 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 | |||
| 17 | augroup TerminalSize | 17 | augroup TerminalSize |
| 18 | au! | 18 | au! |
| 19 | function! LayoutForSmallTerminal(bound) | 19 | function! LayoutForSmallTerminal(bound) |
| 20 | let l:bound = a:bound ? a:bound : 20 | 20 | if &lines < a:bound || g:alacritty_extra_padding |
| 21 | if &lines < l:bound || g:alacritty_extra_padding | 21 | silent! set cmdheight=0 laststatus=0 showtabline=0 nowrap scrolloff=1 |
| 22 | silent! set cmdheight=0 laststatus=0 showtabline=0 signcolumn=no nowrap scrolloff=1 | ||
| 23 | else | 22 | else |
| 24 | silent! set cmdheight& laststatus& showtabline=2 signcolumn=yes scrolloff=3 | 23 | silent! set cmdheight& laststatus& showtabline=2 scrolloff=3 |
| 25 | endif | 24 | endif |
| 26 | endfunc | 25 | endfunc |
| 27 | autocmd VimEnter,VimResized * silent call LayoutForSmallTerminal(0) | 26 | autocmd VimEnter,VimResized * silent call LayoutForSmallTerminal(20) |
| 28 | augroup END | 27 | augroup END |
| 29 | 28 | ||
| 30 | " }}} | 29 | " }}} |
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() | |||
| 53 | if g:alacritty_extra_padding | 53 | if g:alacritty_extra_padding |
| 54 | !alacritty msg config --window-id $WINDOWID --reset | 54 | !alacritty msg config --window-id $WINDOWID --reset |
| 55 | else | 55 | else |
| 56 | redir => output | hi SignColumn | redir END | 56 | redir => output | hi LineNr | redir END |
| 57 | let bg_color = matchstr(output, 'guibg=\zs[^\s]\+\ze') | 57 | let bg_color = matchstr(output, 'guibg=\zs[^\s]\+\ze') |
| 58 | exe "hi EndOfBuffer guifg="..bg_color.." guibg="..bg_color | ||
| 58 | exe "!alacritty msg config --window-id $WINDOWID window.padding.x=300 'colors.primary.background=\"\\"..bg_color.."\"'" | 59 | exe "!alacritty msg config --window-id $WINDOWID window.padding.x=300 'colors.primary.background=\"\\"..bg_color.."\"'" |
| 59 | endif | 60 | endif |
| 60 | 61 | ||
| @@ -439,6 +440,7 @@ endfunc | |||
| 439 | nnoremap <leader><leader>fm :<C-\>e'set foldmethod='..&foldmethod<CR> | 440 | nnoremap <leader><leader>fm :<C-\>e'set foldmethod='..&foldmethod<CR> |
| 440 | nnoremap <leader><leader>fc :<C-\>e'set foldcolumn='..&foldcolumn<CR> | 441 | nnoremap <leader><leader>fc :<C-\>e'set foldcolumn='..&foldcolumn<CR> |
| 441 | 442 | ||
| 443 | " Toggle fold and foldcolumn | ||
| 442 | nnoremap <expr> zi "zizz:silent set foldcolumn="..(&foldenable ? "0" : "auto:3").."\<CR>" | 444 | nnoremap <expr> zi "zizz:silent set foldcolumn="..(&foldenable ? "0" : "auto:3").."\<CR>" |
| 443 | 445 | ||
| 444 | " Show fold level when it changes | 446 | " Show fold level when it changes |