diff options
| author | Hsieh Chin Fan <pham@topo.tw> | 2024-07-11 01:32:15 +0800 |
|---|---|---|
| committer | Hsieh Chin Fan <pham@topo.tw> | 2024-07-11 01:32:15 +0800 |
| commit | 1f7d36d236965aa0f6ddff71321ebc755b79154c (patch) | |
| tree | bf1b6aac4235f94529789704243f08f265248760 | |
| parent | 13ee21d48d8937ea33a1993725320889970fe86f (diff) | |
Update
| -rw-r--r-- | vim/init/config.vim | 16 | ||||
| -rw-r--r-- | vim/init/keymaps.vim | 18 | ||||
| -rw-r--r-- | vim/lua/plugins/init.lua | 1 |
3 files changed, 29 insertions, 6 deletions
diff --git a/vim/init/config.vim b/vim/init/config.vim index 074f09d..903d8a0 100644 --- a/vim/init/config.vim +++ b/vim/init/config.vim | |||
| @@ -11,6 +11,22 @@ augroup DeleteUnnamedEmptBuffer! | |||
| 11 | augroup END | 11 | augroup END |
| 12 | 12 | ||
| 13 | " }}} | 13 | " }}} |
| 14 | " Small Terminal ----------------{{{ | ||
| 15 | |||
| 16 | augroup TerminalSize | ||
| 17 | au! | ||
| 18 | function! LayoutForSmall() | ||
| 19 | echo 'vim resized' | ||
| 20 | if &lines < 18 | ||
| 21 | set cmdheight=0 laststatus=0 showtabline=0 signcolumn=no nowrap scrolloff=1 | ||
| 22 | else | ||
| 23 | set cmdheight& laststatus& showtabline=2 signcolumn=yes scrolloff=3 | ||
| 24 | endif | ||
| 25 | endfunction | ||
| 26 | autocmd VimResized * call LayoutForSmall() | ||
| 27 | augroup END | ||
| 28 | |||
| 29 | " }}} | ||
| 14 | " X11 ----------------{{{ | 30 | " X11 ----------------{{{ |
| 15 | 31 | ||
| 16 | " Change IM to US when exit to Normal mode | 32 | " Change IM to US when exit to Normal mode |
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim index 3f861ea..f71ec7c 100644 --- a/vim/init/keymaps.vim +++ b/vim/init/keymaps.vim | |||
| @@ -14,7 +14,7 @@ vnoremap * y/\V<C-R>=escape(@",'/\')<CR><CR> | |||
| 14 | map <silent> <leader><CR> :noh<CR> | 14 | map <silent> <leader><CR> :noh<CR> |
| 15 | 15 | ||
| 16 | " Set wrap | 16 | " Set wrap |
| 17 | nnoremap <leader>W :set wrap!<CR>:set wrap?<CR> | 17 | nnoremap <leader>W :set wrap!<CR> |
| 18 | 18 | ||
| 19 | " Fast saving | 19 | " Fast saving |
| 20 | nmap <leader>w :w!<CR> | 20 | nmap <leader>w :w!<CR> |
| @@ -220,11 +220,8 @@ function! CheckSave() | |||
| 220 | if answer == 3 | return | endif | 220 | if answer == 3 | return | endif |
| 221 | endif | 221 | endif |
| 222 | 222 | ||
| 223 | if len(getbufinfo({'buflisted': 1})) == 2 | 223 | bdelete! |
| 224 | try | buffer # | bdelete! # | catch | endtry | 224 | |
| 225 | else | ||
| 226 | bdelete! | ||
| 227 | endif | ||
| 228 | endfunction | 225 | endfunction |
| 229 | func! QuitWithCheck() | 226 | func! QuitWithCheck() |
| 230 | if g:quitVimWhenPressingCtrlC | 227 | if g:quitVimWhenPressingCtrlC |
| @@ -365,6 +362,15 @@ noremap <leader><leader>fm :<C-\>e'set foldmethod='..&foldmethod<CR> | |||
| 365 | nnoremap zm zm:set foldlevel<CR> | 362 | nnoremap zm zm:set foldlevel<CR> |
| 366 | nnoremap zr zr:set foldlevel<CR> | 363 | nnoremap zr zr:set foldlevel<CR> |
| 367 | 364 | ||
| 365 | " Fold file except selection | ||
| 366 | function! UnfoldSelectionOnly() | ||
| 367 | set foldmethod=manual | ||
| 368 | norm! zE | ||
| 369 | execute "0,'<-1fold" | ||
| 370 | execute "'>+1,$fold" | ||
| 371 | endfunction | ||
| 372 | vnoremap zF :call UnfoldSelectionOnly()<CR> | ||
| 373 | |||
| 368 | " Use l to open fold | 374 | " Use l to open fold |
| 369 | nnoremap <expr> l foldclosed('.') == -1 ? 'l' : 'zo' | 375 | nnoremap <expr> l foldclosed('.') == -1 ? 'l' : 'zo' |
| 370 | 376 | ||
diff --git a/vim/lua/plugins/init.lua b/vim/lua/plugins/init.lua index 373f4cc..03a7d46 100644 --- a/vim/lua/plugins/init.lua +++ b/vim/lua/plugins/init.lua | |||
| @@ -310,6 +310,7 @@ return { | |||
| 310 | 310 | ||
| 311 | { | 311 | { |
| 312 | "folke/which-key.nvim", | 312 | "folke/which-key.nvim", |
| 313 | lazy = false, | ||
| 313 | opts = { | 314 | opts = { |
| 314 | presets = { | 315 | presets = { |
| 315 | windows = true, -- default bindings on <c-w> | 316 | windows = true, -- default bindings on <c-w> |