3 files changed, 171 insertions, 107 deletions

diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index 2394045..e18d51f 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -4,7 +4,7 @@
 " Used for general usecases. No keymap and personal preference
 "======================================================================
 
-" Vimscript file settings ---------------------- {{{
+" For Vimscript {{{
 
 " Usage: type --- for foldmark
 augroup filetype_vim
@@ -14,13 +14,63 @@ augroup filetype_vim
 augroup END
 
 " }}}
-" GERERNAL ----------------{{{
+" For Buffer and Tab {{{
+augroup tabinfo
+  au!
+  let g:tab_group = {}
+  " BufEnter {{{
+  function! AddBufToTabGroup(tab_group)
+    let l:tabId = tabpagenr()
+    let l:bufnr = bufnr()
+
+    if has_key(a:tab_group, l:tabId)
+      for v in a:tab_group[l:tabId]
+        if v == l:bufnr
+          return
+        endif
+      endfor
+      call add(a:tab_group[l:tabId], l:bufnr)
+    else
+      let a:tab_group[l:tabId] = [l:bufnr]
+    endif
+
+  endfunc
+  autocmd BufWinEnter * if &buflisted | call AddBufToTabGroup(g:tab_group) | endif
+  " }}}
+  " BufDelete {{{
+  function! RemoveBufFromTabGroup(tab_group)
+    let l:tabId = tabpagenr()
+
+    if has_key(a:tab_group, l:tabId)
+      let l:new_tab_group = {}
+
+      for [k, tab_list] in items(a:tab_group)
+        let l:list = []
+        for buf in tab_list
+          if buflisted(buf) > 0 && buf != expand('<abuf>')
+            call add(l:list, buf)
+          end
+        endfor
+        if !empty(l:list)
+          let l:new_tab_group[k] = l:list
+        endif
+      endfor
+      let g:tab_group = l:new_tab_group
+
+    endif
+
+  endfunc
+  autocmd BufDelete * call RemoveBufFromTabGroup(g:tab_group)
+  "}}}
+augroup END
+"}}}
+" GERERNAL {{{
 
-let mapleader = ","         " Always use comma as leader key
-set nocompatible          " Disable vi compatible, today is 20XX
-set path=.,**               " Allow :find with completion
-set mouse=                    " Disable mouse selection
-set winaltkeys=no           " Allow alt key for mapping
+let mapleader = ","     " Always use comma as leader key
+set nocompatible        " Disable vi compatible, today is 20XX
+set path=.,**           " Allow :find with completion
+set mouse=              " Disable mouse selection
+set winaltkeys=no       " Allow alt key for mapping
 
 " Turn persistent undo on
 " means that you can undo even when you close a buffer/VIM
@@ -43,22 +93,20 @@ set spellfile="/tmp/spell"
 sign define piet text=>> texthl=Search
 
 " }}}
-" VISUAL ----------------{{{
+" VISUAL {{{
 
 " colorscheme desert
 
 " Editing Area
-set wrap                                " enable wrap by default
-set scrolloff=3                   " Leave some buffer when scrolling down
-set showmatch                       " Show pairing brackets
+set wrap                " enable wrap by default
+set scrolloff=3         " Leave some buffer when scrolling down
+set showmatch           " Show pairing brackets
 set display=lastline
 set lazyredraw
-set formatoptions+=m        " 遇到Unicode值大於255的文本，不必等到空格再折行
-set formatoptions+=B        " 合併兩行中文時，不在中間加空格
 set whichwrap=b,s
 
 " Side column
-set signcolumn=yes number relativenumber
+set  number relativenumber
 
 " Cursor
 set cursorline
@@ -67,30 +115,40 @@ set matchtime=2
 
 " In most of the cases, it is overrides by lightline.vim
 set statusline=\ %F%m%r%h\ %w\ \ CWD:\ %r%{getcwd()}%h\ \ \ Line:\ %l\ \ Column:\ %c
-set laststatus=2              " Always show the status line
-set ruler                               " Show cursor position
+set laststatus=2            " Always show the status line
+set ruler                    " Show cursor position
 set wildmenu wildoptions=pum,fuzzy
 
 " Format of error message
 set errorformat+=[%f:%l]\ ->\ %m,[%f:%l]:%m
 
+" Direction for new window
+set splitright
+
 " }}}
-" EDIT ----------------{{{
+" EDIT {{{
+
+" overrides ftplugin in runtimepath
+" Don't wrap line when typing CJK characters
+" Don't add spaces for CJK
+" Don't add comment at next line
+autocmd Filetype * set fo+=mB fo-=cro
 
-set backspace=eol,start,indent " Set Backspace behaviors
-set autoindent smartindent
 set shiftwidth=2
+set autoindent smartindent
 set cindent
 set ttimeout
 set timeoutlen=500
+
+set backspace=eol,start,indent  " Set Backspace behaviors
+
 " set updatetime=4000
 " autocmd CursorHold * normal! m'
 
-" TAB and special Chars ----------------{{{
+" TAB and special Chars {{{
 
-set tabstop=8
+set tabstop=8 softtabstop=8
 set expandtab
-set softtabstop=-1
 
 " Invisible chars
 set nolist
@@ -99,23 +157,23 @@ set listchars=tab:»·,extends:>,precedes:<
 " }}}
 
 " }}}
-" JUMP to anoterh file ----------------{{{
+" JUMP to anoterh file {{{
 
 set isfname=@,48-57,/,.,-,_,+,,,#,$,%,~ " This affects filename recognition for gf (go to file)
-set suffixesadd=.md                     " Enable reference markdown file without extension
+set suffixesadd=.md                     " Enable reference markdown file without extension
 
 " }}}
-" SEARCH ----------------{{{
+" SEARCH {{{
 
-set ignorecase      " Search case without case sensation
+set ignorecase  " Search case without case sensation
 set smartcase
-set hlsearch        " Hilight all matched texts
-set incsearch       " Show matched strings when typing
+set hlsearch    " Highlight all matched texts
+set incsearch   " Show matched strings when typing
 
 " }}}
-" BUFFERS ----------------{{{
+" BUFFERS {{{
 
-" Go to last cursor position ----------------{{{
+" Go to last cursor position {{{
 augroup vimStartup
   au!
   " When editing a file, always jump to the last known cursor position.
@@ -131,21 +189,22 @@ augroup END
 " }}}
 
 " }}}
-" FOLD ----------------{{{
+" FOLD {{{
+
 set foldenable          " Allow fold
 set foldmethod=indent   " Fold contents by indent
 set foldlevel=2
 set fillchars+=foldopen:▽,foldsep:│,foldclose:▶
 let g:defaut_foldcolumn = ""
 if has('nvim')
-  let g:defaut_foldcolumn = "auto:5"
+  let g:defaut_foldcolumn = "auto:3"
 else
-  let g:defaut_foldcolumn = 5
+  let g:defaut_foldcolumn = 3
 endif
 let &foldcolumn = g:defaut_foldcolumn
 
 " }}}
-" ENCODING_PREFERENCE ----------------{{{
+" ENCODING_PREFERENCE {{{
 
 if has('multi_byte')
   set encoding=utf-8
@@ -155,7 +214,7 @@ if has('multi_byte')
 endif
 
 " }}}
-" BACKUP ----------------{{{
+" BACKUP {{{
 
 " Allow backup
 set backup
@@ -170,7 +229,7 @@ set backupdir=~/.vim/tmp
 set writebackup
 
 " }}}
-" HIGHLIGHT ----------------{{{
+" HIGHLIGHT {{{
 
 syntax enable
 set conceallevel=1
@@ -185,7 +244,7 @@ highlight ExtraWhitespace ctermbg=red guibg=red
 match ExtraWhitespace /\s\+$/
 
 " }}}
-" MISC ----------------{{{
+" MISC {{{
 
 " Use Unix way to add newline
 set ffs=unix,dos,mac
diff --git a/vim/init/config.vim b/vim/init/config.vim
index 4e1c06c..4181ad3 100644
--- a/vim/init/config.vim
+++ b/vim/init/config.vim
@@ -3,7 +3,7 @@
 " Do some autocommand for by contexts
 "======================================================================
 
-" Unnamed Buffer ----------------{{{
+" Unnamed Buffer {{{
 
 " Automatically delete unnamed empty buffer when leaving
 augroup DeleteUnnamedEmptBuffer!
@@ -12,7 +12,7 @@ augroup DeleteUnnamedEmptBuffer!
 augroup END
 
 " }}}
-" Small Terminal ----------------{{{
+" Small Terminal {{{
 
 augroup TerminalSize
   au!
@@ -27,13 +27,13 @@ augroup TerminalSize
 augroup END
 
 " }}}
-" X11 ----------------{{{
+" X11 {{{
 
 " Change IM to US when exit to Normal mode
 autocmd InsertLeave * :silent !fcitx-remote -c &>/dev/null || true
 
 " }}}
-" TMUX ----------------{{{
+" TMUX {{{
 
 " 有 tmux 何没有的功能键超时（毫秒）
 if $TMUX != ''
@@ -60,7 +60,7 @@ if !has('gui_running') && &term =~ '^\%(screen\|tmux\)'
 endif
 
 " }}}
-" KeyCode ----------------{{{
+" KeyCode {{{
 
 "----------------------------------------------------------------------
 " 终端下允许 ALT，详见：http://www.skywind.me/blog/archives/2021
@@ -114,22 +114,22 @@ call s:key_escape('<S-F11>', '[23;2~')
 call s:key_escape('<S-F12>', '[24;2~')
 
 " }}}
-" Filetype ----------------{{{
+" Filetype {{{
 
 augroup InitFileTypes
 
   au!
 
-  " Filetype for Vim ----------------{{{
+  " Filetype for Vim {{{
 
   " Help page
-  autocmd BufEnter *.txt if &filetype == 'help' | wincmd T | endif
+  autocmd BufEnter * if &filetype == 'help' | wincmd T | set buflisted | endif
 
   " quickfix: hide line number
   autocmd FileType quickfix setlocal nonumber
 
   " }}}
-  " Shebeng: Set filetype from shebeng ----------------{{{
+  " Shebeng: Set filetype from shebeng {{{
   function! s:ApplyShebang()
     let l:filetype = matchstr(getline(1), '^#!.*[ /]\zs[[:alnum:]]\+$')
     let l:shebangMatch = #{ node: "javascript" }
@@ -143,7 +143,7 @@ augroup InitFileTypes
   endfunction
   autocmd BufReadPost * call <SID>ApplyShebang()
   " }}}
-  " Markdown ----------------{{{
+  " Markdown {{{
 
   augroup Config_Markdown
     au!
@@ -168,7 +168,7 @@ augroup InitFileTypes
   augroup END
 
   " }}}
-  " HTML ----------------{{{
+  " HTML {{{
 
   " Usage: <leader>cl(ass) or <leader>id to edit html tag attribute
   function! s:ChangeAttr(pattern)
@@ -192,17 +192,17 @@ augroup InitFileTypes
 
   " Reload preview server
   autocmd BufWrite *.html,*.js,*.css call ReloadServer()
-  function ReloadServer()
+  function! ReloadServer()
     silent !browser-sync reload &>/dev/null
   endfunction
 
   " }}}
-  " Mail ----------------{{{
+  " Mail {{{
 
   autocmd BufRead /tmp/mutt-* set tw=72
 
   " }}}
-  " Password ----------------{{{
+  " Password {{{
 
   " Hide the first line of a file if editing password file
   " TODO a better way to determine a file is related to password-store, now use
@@ -218,7 +218,7 @@ augroup InitFileTypes
     norm! ggzfl
   endfunction
   " }}}
-  " Beancount ----------------{{{
+  " Beancount {{{
 
   autocmd BufRead,BufNewFile *.bean call PrepareBean()
   function PrepareBean()
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index f13756b..1eb2b20 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -21,15 +21,15 @@ nnoremap <leader>W :set wrap!<CR>
 function! s:WriteOrEnterFileName()
   if !empty(expand('%')) | write! | else | call feedkeys(":w ") | endif
 endfunction
-nmap <leader>w :call <SID>WriteOrEnterFileName()<CR>
+nnoremap <leader>w :call <SID>WriteOrEnterFileName()<CR>
 
 " :W sudo saves the file
 " (useful for handling the permission-denied error)
 command! W execute 'w !sudo -S tee %' <bar> edit!
 
 " Quit
-nmap <leader>q :q<CR>
-nmap cq :cq<CR>
+nnoremap <leader>q :q<CR>
+nnoremap cq :cq<CR>
 
 " Remap <CR> in Quickfix, Cmdwin Location list
 augroup vimrc_CRfix
@@ -57,7 +57,7 @@ augroup END
 " execute "set <M-h>=\eh"
 
 " Spell
-nnoremap <leader><leader>sp :set spell!<CR>:set spell?<CR>
+nnoremap \s :set spell!<CR>:set spell?<CR>
 nnoremap <leader>ss ]s
 nnoremap <leader>S [s
 
@@ -68,6 +68,7 @@ nnoremap <C-g> 1<C-g>
 vnoremap Tz :!trans -t zh-TW -b<CR>
 vnoremap Te :!trans -t en-US -b<CR>
 
+
 " }}}
 " WORKING_DIR ----------------{{{
 
@@ -82,8 +83,8 @@ nnoremap cd :cd %:p:h<CR>:pwd<CR>
 
 nnoremap cd<space> :cd<space>
 nnoremap cdg :call CdToGitRepo()<CR>:pwd<CR>
-noremap <C-[> :cd ..<CR>:pwd<CR>
-noremap <C-]> :call InCaseCdToLatestDir()<CR>
+nnoremap <C-[> :cd ..<CR>:pwd<CR>
+nnoremap <C-]> :call InCaseCdToLatestDir()<CR>
 
 " Switch CWD to root git directory
 function! CdToGitRepo()
@@ -105,17 +106,21 @@ endfunction
 " MOTION ----------------{{{
 
 " j/k will move virtual lines (lines that wrap)
-noremap <silent> <expr> j (v:count == 0 ? 'gj' : 'j')
-noremap <silent> <expr> k (v:count == 0 ? 'gk' : 'k')
+nnoremap <silent> <expr> j (v:count == 0 ? 'gj' : 'j')
+nnoremap <silent> <expr> k (v:count == 0 ? 'gk' : 'k')
 
 " Quick move in a line
-noremap <C-h> 30h
-noremap <C-l> 30l
+nnoremap <C-h> 30h
+nnoremap <C-l> 30l
 
 " File under the cursor
 nnoremap <CR> gf
 nnoremap gF :e <cfile><CR>
 
+xnoremap iq i"
+xnoremap aq a"
+
+
 " READLINE_FEATURES ----------------{{{
 
 inoremap <C-f> <Right>
@@ -145,22 +150,22 @@ cnoremap <C-k> <C-x>d$<C-c>
 cnoremap <M-d> <C-x>de<C-c>
 
 " Moving with wrap
-noremap <m-j> gj
-noremap <m-k> gk
+nnoremap <m-j> gj
+nnoremap <m-k> gk
 inoremap <m-j> <c-\><c-o>gj
 inoremap <m-k> <c-\><c-o>gk
 " }}}
 " JUMP_TO_TABS_WITH_ALT ----------------{{{
 
-noremap <silent><A-1> :tabn 1<CR>
-noremap <silent><A-2> :tabn 2<CR>
-noremap <silent><M-3> :tabn 3<CR>
-noremap <silent><M-4> :tabn 4<CR>
-noremap <silent><M-5> :tabn 5<CR>
-noremap <silent><M-6> :tabn 6<CR>
-noremap <silent><M-7> :tabn 7<CR>
-noremap <silent><M-8> :tabn 8<CR>
-noremap <silent><M-9> :tablast<CR>
+nnoremap <silent><A-1> :tabn 1<CR>
+nnoremap <silent><A-2> :tabn 2<CR>
+nnoremap <silent><M-3> :tabn 3<CR>
+nnoremap <silent><M-4> :tabn 4<CR>
+nnoremap <silent><M-5> :tabn 5<CR>
+nnoremap <silent><M-6> :tabn 6<CR>
+nnoremap <silent><M-7> :tabn 7<CR>
+nnoremap <silent><M-8> :tabn 8<CR>
+nnoremap <silent><M-9> :tablast<CR>
 inoremap <silent><A-1> <Esc>:tabn 1<CR>
 inoremap <silent><A-2> <Esc>:tabn 2<CR>
 inoremap <silent><M-3> <Esc>:tabn 3<CR>
@@ -211,23 +216,25 @@ nnoremap <leader>ee :edit $MYVIMRC<CR>
 " MANAGE_BUFFERS ----------------{{{
 
 " Set options
-noremap st :set<space>
-noremap <leader><leader>ft :<C-\>e'set filetype='..&filetype<CR>
-noremap <leader><leader>li :set list!<CR>
-noremap <leader><leader>sw :<C-\>e'set shiftwidth='..&shiftwidth<CR>
-noremap <leader><leader>nu :set number!<CR>
-noremap <leader><leader>ru :set relativenumber!<CR>
+nnoremap so :set<space>
+nnoremap <leader><leader>ft :<C-\>e'set filetype='..&filetype<CR>
+nnoremap <leader><leader>sw :<C-\>e'set shiftwidth='..&shiftwidth<CR>
+nnoremap <leader><leader>ts :<C-\>e'set tabstop='..&tabstop<CR>
+nnoremap \e :set expandtab!<CR>:set expandtab?<CR>
+nnoremap \l :set list!<CR>:set list?<CR>
+nnoremap \n :set nu!<CR>:set nu?<CR>
+nnoremap \r :set relativenumber!<CR>:set rnu?<CR>
 
 " Open a new buffer
-nmap <leader>B :enew<CR>
-nmap <leader>O :e /tmp/buffer<CR>
+nnoremap <leader>B :enew<CR>
+nnoremap <leader>O :e /tmp/buffer<CR>
 
 " Let <leader>l toggle between this and the last accessed buffer
 augroup SaveLastBuffer
   let g:lastbuffer = 1
-  au BufLeave * let g:lastbuffer = bufnr()
+  au BufLeave * if &buflisted | let g:lastbuffer = expand('<abuf>') | endif
 augroup END
-noremap <leader>l :exe "buffer ".g:lastbuffer<CR>
+nnoremap <leader>l :exe "buffer ".g:lastbuffer<CR>
 
 " Use Ctrl-C for buffer delete or quit vim ----------------{{{
 
@@ -238,9 +245,11 @@ function! ToggleQuit()
   let message = g:quitVimWhenPressingCtrlC ? "Unlock" : "Lock"
   echo message
 endfunction
-nnoremap <leader><leader>gl :call ToggleQuit()<CR>
+nnoremap \q :call ToggleQuit()<CR>
 
 function! CloseBufferSafely()
+  let l:bufnr = bufnr()
+  " Ask Saving
   if &modified
     let answer = confirm("Save changes?", "&Yes\n&No\n&Cancel")
     if answer == 1 | write | endif
@@ -248,27 +257,22 @@ function! CloseBufferSafely()
     if answer == "" | return | endif
   endif
 
-  let bufs = getbufinfo({'buflisted': 1})
-  if len(bufs) == 1
-    bdelete!
+  if g:tab_group[tabpagenr()] == [l:bufnr]
+    bdelete
   else
-    b# | bd! #
+    bprevious | bd #
   endif
 endfunction
 func! QuitWithCheck()
   if g:quitVimWhenPressingCtrlC
     silent! quit
   else
-    echo "Press <leader><leader>gl to allow quit with <C-c>"
+    echo "Press \\q to allow quit with <C-c>"
   endif
 endfunc
 function! Bye()
   let windows = gettabinfo(tabpagenr())[0]['windows']
-  try
-    let bufs = gettabinfo(tabpagenr())[0]['variables']['bufs']
-  catch
-    let bufs = getbufinfo({'buflisted': 1})
-  endtry
+  let bufs = getbufinfo({'buflisted': 1})
 
   if len(windows) == 1 && len(bufs) == 1
     call QuitWithCheck()
@@ -282,8 +286,8 @@ function! Bye()
 endfunction
 nnoremap <silent> <C-c> :call Bye()<CR>
 
-
-" Diff Mode ----------------
+" }}}
+" Diff Mode {{{
 
 function! CloseBuffersForDiff()
   windo | if &diff && &buftype == "nofile" | bdelete | endif
@@ -329,10 +333,10 @@ nnoremap <leader><leader>sb :windo set scrollbind!<CR>
 " 传统的 CTRL+hjkl 移动窗口不适用于 vim 8.1 的终端模式，CTRL+hjkl 在
 " bash/zsh 及带文本界面的程序中都是重要键位需要保留，不能 tnoremap 的
 "----------------------------------------------------------------------
-noremap <m-H> <c-w>h
-noremap <m-L> <c-w>l
-noremap <m-J> <c-w>j
-noremap <m-K> <c-w>k
+nnoremap <m-H> <c-w>h
+nnoremap <m-L> <c-w>l
+nnoremap <m-J> <c-w>j
+nnoremap <m-K> <c-w>k
 inoremap <m-H> <esc><c-w>h
 inoremap <m-L> <esc><c-w>l
 inoremap <m-J> <esc><c-w>j
@@ -365,12 +369,12 @@ map <leader>tc :tabclose<CR>
 map <leader>tm :tabmove<SPACE>
 map <leader>to :tabonly<CR>
 
-noremap <silent><m-h> :call Tab_MoveLeft()<CR>
-noremap <silent><m-l> :call Tab_MoveRight()<CR>
+nnoremap <silent><m-h> :call Tab_MoveLeft()<CR>
+nnoremap <silent><m-l> :call Tab_MoveRight()<CR>
 
 " Let <leader>tl toggle between this and the last accessed tab
 let g:lasttab = 1
-nmap <Leader>tl :exe "tabn ".g:lasttab<CR>
+nnoremap <Leader>tl :exe "tabn ".g:lasttab<CR>
 autocmd TabLeave * let g:lasttab = tabpagenr()
 
 " Opens a new tab with the current buffer's path
@@ -394,8 +398,8 @@ endfunc
 " FOLD ----------------{{{
 
 " Set fold options
-noremap <leader><leader>fm :<C-\>e'set foldmethod='..&foldmethod<CR>
-noremap <leader><leader>fc :<C-\>e'set foldcolumn='..&foldcolumn<CR>
+nnoremap <leader><leader>fm :<C-\>e'set foldmethod='..&foldmethod<CR>
+nnoremap <leader><leader>fc :<C-\>e'set foldcolumn='..&foldcolumn<CR>
 
 nnoremap zi zizz
 
@@ -463,7 +467,7 @@ endfunction
 " HIGHLIGHT ----------------{{{
 
 " Disable highlight when <leader><CR> is pressed
-noremap <silent> <leader><CR> :noh<CR>
+nnoremap <silent> <leader><CR> :noh<CR>
 
 function! HiFile()
   let i = 1
@@ -501,7 +505,6 @@ inoremap ( ()<Left>
 inoremap [ []<Left>
 inoremap { {}<Left>
 
-vnoremap S sa
 vnoremap ' <ESC>`<i'<ESC>`>la'<ESC>
 vnoremap q <ESC>`<i"<ESC>`>la"<ESC>
 vnoremap ( <ESC>`<i(<ESC>`>la)<ESC>
@@ -591,6 +594,8 @@ vnoremap <CR> <Cmd>call SubstituteBySearch()<CR>
 " }}}
 " SIGN ----------------{{{
 
+nnoremap <leader><leader>sc :<C-\>e'set signcolumn='..&signcolumn<CR>
+
 nnoremap <leader>si :exe ":sign place " .. line('.') .. " line=" .. line('.') .. " name=piet file=" .. expand("%:p")<CR>
 nnoremap <leader>sI :exe ":sign unplace * file=" .. expand("%:p")<CR>