5 files changed, 179 insertions, 140 deletions

diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index a54bf59..c066f07 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -12,8 +12,10 @@ augroup filetype_vim
     execute "autocmd FileType vim :inoreabbrev <buffer> --- ----------------{".."{{"
     autocmd FileType vim setlocal foldmethod=marker foldlevel=0
 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
@@ -32,6 +34,7 @@ filetype plugin indent on
 " Unnamed buffer like CmdWindows should prevent this
 set autoread
 autocmd FocusGained,BufEnter .* checktime
+
 " }}}
 " VISUAL ----------------{{{
 
@@ -64,14 +67,12 @@ set wildmenu wildoptions=pum,fuzzy
 " Format of error message
 set errorformat+=[%f:%l]\ ->\ %m,[%f:%l]:%m
 
-" 顯示分隔符號
-set listchars=tab:\|\ ,trail:.,extends:>,precedes:<
-
 " }}}
 " EDIT ----------------{{{
 
 set backspace=eol,start,indent " Set Backspace behaviors
-set autoindent              " If current line has indent, automatically set indent for next line
+set autoindent smartindent
+set shiftwidth=2
 set cindent
 set ttimeout
 set ttimeoutlen=50
@@ -80,14 +81,14 @@ set ttimeoutlen=50
 
 imap <C-c> <Esc>l
 
-" TABSIZE ----------------{{{
+" TAB ----------------{{{
 
 set expandtab
-set shiftwidth=2
-set autoindent
-set tabstop=4
-set softtabstop=0
-set smartindent
+set softtabstop=-1
+
+" 顯示分隔符號
+set list
+set listchars=tab:▷▷,extends:>,precedes:<
 
 " }}}
 
@@ -99,39 +100,15 @@ set suffixesadd=.md			" Enable reference markdown file without extension
 
 " }}}
 " 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        " Hilight all matched texts
+set incsearch       " Show matched strings when typing
+
 " }}}
 " BUFFERS ----------------{{{
 
-" Use <C-c> to quit the last buffer ----------------{{{
-let g:quitVimWhenPressingCtrlC = 1
-function! ToggleQuit()
-  let g:quitVimWhenPressingCtrlC = g:quitVimWhenPressingCtrlC ? 0 : 1
-  let message = g:quitVimWhenPressingCtrlC ? "Unlock" : "Lock"
-  echo message
-endfunction
-
-nnoremap <leader><leader>gl :call ToggleQuit()<CR>
-
-function! Bye()
-  if len(getbufinfo({'buflisted': 1})) == 1 && len(getwininfo()) == 1
-    if g:quitVimWhenPressingCtrlC
-      :silent! quit
-    else
-      :echo "Press <leader><leader>gl to allow quit with <C-c>"
-    endif
-  else
-    :bdelete
-  endif
-endfunction
-
-" Ctrl-C rules!!!
-nnoremap <silent> <C-c> :call Bye()<CR>
-
-" }}}
 " Go to last cursor position ----------------{{{
 augroup vimStartup
   au!
@@ -141,7 +118,7 @@ augroup vimStartup
   " (it's likely a different one than last time).
   autocmd BufReadPost *
         \ if line("'\"") >= 1 && line("'\"") <= line("$") && &ft !~# 'commit'
-        \ |   exe "normal! g`\""
+        \ |   exe "normal! g`\"zv"
         \ | endif
 augroup END
 
@@ -158,10 +135,12 @@ if has('multi_byte')
 endif
 
 " }}}
-" FOLDING ----------------{{{
+" FOLD ----------------{{{
+
 set foldenable          " Allow fold
 set foldmethod=indent   " Fold contents by indent
 set foldlevel=2
+
 " }}}
 " BACKUP ----------------{{{
 
@@ -176,8 +155,10 @@ set backupdir=~/.vim/tmp
 
 " backup when write file
 set writebackup
+
 " }}}
 " HIGHLIGHT ----------------{{{
+
 syntax enable
 set conceallevel=1
 
@@ -186,6 +167,7 @@ function! GetHighlightGroupName()
   let l:groupName = synIDattr(l:syntaxID, 'name')
   echo "Highlight Group Name: " . l:groupName
 endfunction
+nnoremap <leader>H :call GetHighlightGroupName()<CR>
 
 " Defualt highlight for matched parenthesis is so weird in many colorscheme
 " Why the background color is lighter than my caret !?
@@ -203,6 +185,7 @@ highlight MultiLineHighlight ctermbg=LightYellow guibg=LightYellow ctermfg=Black
 nnoremap <silent> <leader>gh :call matchadd('MultiLineHighlight', '\%'.line('.').'l')<CR>
 " clear all the highlighted lines
 nnoremap <silent> <leader>gH :call clearmatches()<CR>
+
 " }}}
 " MISC ----------------{{{
 
diff --git a/vim/init/config.vim b/vim/init/config.vim
index ae623ec..074f09d 100644
--- a/vim/init/config.vim
+++ b/vim/init/config.vim
@@ -6,6 +6,7 @@
 " Unnamed Buffer ----------------{{{
 
 augroup DeleteUnnamedEmptBuffer!
+  au!
   au BufLeave {} if getline(1, '$') == [''] | setlocal bufhidden=wipe | endif
 augroup END
 
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index f46e67b..38bdd0e 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -1,7 +1,6 @@
 "======================================================================
 " Only for key mapping
 "======================================================================
-" vim: set ts=4 sw=4 tw=78 noet :
 
 " COMMON_MAPPING ----------------{{{
 
@@ -14,29 +13,22 @@ vnoremap * y/\V<C-R>=escape(@",'/\')<CR><CR>
 " Disable highlight when <leader><CR> is pressed
 map <silent> <leader><CR> :noh<CR>
 
-" Paste register 0
-nnoremap <C-p> "0p
+" Set wrap
+nnoremap <leader>W :set wrap!<CR>:set wrap?<CR>
 
 " Fast saving
 nmap <leader>w :w!<CR>
 
+" :W sudo saves the file
+" (useful for handling the permission-denied error)
+command! W execute 'w !sudo -S tee %' <bar> edit!
+
 " Fast quit with error
 nmap <leader>q :q<CR>
 
 " Fast quit with error
 nmap cq :cq<CR>
 
-" Switch wrap
-nmap <leader>W :set wrap!<CR>
-
-" :W sudo saves the file
-" (useful for handling the permission-denied error)
-command! W execute 'w !sudo -S tee %' <bar> edit!
-
-" Enter to open file
-nnoremap <CR> gf
-nnoremap gF :e <cfile><CR>
-
 " Remap <CR> in Quickfix, Cmdwin Location list
 augroup vimrc_CRfix
   au!
@@ -49,13 +41,25 @@ augroup END
 " nnoremap <leader>, :terminal ++noclose<CR>
 vnoremap <leader>, :terminal<CR>
 
+" Paste register 0
+nnoremap <C-p> "0p
+
 " Toggle paste mode on and off
 map <leader>pp :setlocal paste!<CR>
 
+" Copy from system clipboard
+nnoremap <leader>P :r !xsel -ob<CR>
+vnoremap Y :w !xsel -ib<CR>
+
 " Switch CWD to the directory of the open buffer
 nnoremap cd :cd %:p:h<CR>:pwd<CR>
 " Switch CWD to root git directory
-nnoremap cdg :execute 'cd' fnameescape(fnamemodify(finddir('.git', escape(expand('%:p:h'), ' ') . ';'), ':h'))<CR>:pwd<CR>
+function! CdToGitRepo()
+    let l:git_dir = finddir('.git', escape(expand('%:p:h'), ' ') . ';')
+    let l:repo = fnameescape(fnamemodify(l:git_dir, ':h'))
+    execute "cd" l:repo
+endfunction
+nnoremap cdg :call CdToGitRepo()<CR>:pwd<CR>
 
 " alias for cd
 nnoremap cdd :cd<space>
@@ -83,10 +87,6 @@ nnoremap <C-k> ddkP
 " execute "set <M-l>=\el"
 " execute "set <M-h>=\eh"
 
-" Copy from system clipboard
-nnoremap <leader>P :r !xsel -ob<CR>
-vnoremap Y :w !xsel -ib<CR>
-
 " Spell
 nnoremap <leader><leader>sp :set spell!<CR>
 nnoremap <leader>ss ]s
@@ -99,11 +99,6 @@ nnoremap <C-g> 1<C-g>
 vnoremap Tz :!trans -t zh-TW -b<CR>
 vnoremap Te :!trans -t en-US -b<CR>
 
-" source .vimrc
-nnoremap <leader>so V:so<CR>
-nnoremap <leader><leader>so :source ~/.vimrc<CR>
-vnoremap so :source<CR>
-
 " }}}
 " MOVE ----------------{{{
 
@@ -115,15 +110,11 @@ noremap <silent> <expr> k (v:count == 0 ? 'gk' : 'k')
 noremap <C-h> 30h
 noremap <C-l> 30l
 
-" }}}
-" MANAGE_VIMRC ----------------{{{
+" File under the cursor
+nnoremap <CR> gf
+nnoremap gF :e <cfile><CR>
 
-nnoremap <leader>e :scriptnames<space>
-nnoremap <leader>ee :edit $MYVIMRC<CR>
-autocmd! BUFWRITEPOST $MYVIMRC source $MYVIMRC
-
-" }}}
-" MOVING_WITH_READLINE ----------------{{{
+" READLINE_FEATURES ----------------{{{
 
 inoremap <C-f> <Right>
 inoremap <C-b> <Left>
@@ -157,15 +148,6 @@ noremap <m-k> gk
 inoremap <m-j> <c-\><c-o>gj
 inoremap <m-k> <c-\><c-o>gk
 " }}}
-" INSERT_SURROUNDING ----------------{{{
-
-inoremap ' ''<Left>
-inoremap " ""<Left>
-inoremap ( ()<Left>
-inoremap [ []<Left>
-inoremap { {}<Left>
-
-" }}}
 " JUMP_TO_TABS_WITH_ALT ----------------{{{
 
 noremap <silent><A-1> :tabn 1<CR>
@@ -188,87 +170,122 @@ inoremap <silent><M-8> <Esc>:tabn 8<CR>
 inoremap <silent><M-9> <Esc>:tablast<CR>
 
 " }}}
-" MANAGE_TABS ----------------{{{
 
-" Useful mappings for managing tabs
-map <leader>tn :tabnew<CR>
-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>
+" }}}
+" MANAGE_VIMRC ----------------{{{
 
-" Let <leader>tl toggle between this and the last accessed tab
-let g:lasttab = 1
-nmap <Leader>tl :exe "tabn ".g:lasttab<CR>
-autocmd TabLeave * let g:lasttab = tabpagenr()
+" source .vimrc
+nnoremap <leader>so V:so<CR>
+nnoremap <leader><leader>so :source ~/.vimrc<CR>
+vnoremap so :source<CR>
+autocmd! BUFWRITEPOST $MYVIMRC source $MYVIMRC
 
-" Opens a new tab with the current buffer's path
-" Super useful when editing files in the same directory
-map <leader>te :tabedit <C-r>=expand("%:p:h")<CR>
+"  Find scripts
+nnoremap <leader>e :scriptnames<space>
+nnoremap <leader>ee :edit $MYVIMRC<CR>
 
-" Tab move functions
-function! Tab_MoveLeft()
-  let l:tabnr = tabpagenr() - 2
-  if l:tabnr >= 0
-    exec 'tabmove '.l:tabnr
-  endif
-endfunc
-function! Tab_MoveRight()
-  let l:tabnr = tabpagenr() + 1
-  if l:tabnr <= tabpagenr('$')
-    exec 'tabmove '.l:tabnr
-  endif
-endfunc
 " }}}
 " MANAGE_BUFFERS ----------------{{{
 
-" set buflisted
+" Set options
 noremap <leader>st :set<space>
+noremap <leader><leader>ft :<C-\>e'set filetype='..&filetype<CR>
 
 " Open a new buffer
-nmap <leader><leader>b :enew<CR>
 nmap <leader>B :enew<CR>
 nmap <leader>O :e /tmp/buffer<CR>
 
-" Next buffer
-noremap <leader>l :exe "buffer ".g:lastbuffer<CR>
-" noremap <Tab> :exe 'buffer '.g:lastbuffer<CR>
-
-" set filetype
-noremap <leader><leader>ft :<C-\>e'set filetype='..&filetype<CR>
-
 " Let <leader>l toggle between this and the last accessed buffer
 augroup SaveLastBuffer
   let g:lastbuffer = 1
   au BufLeave * let g:lastbuffer = bufnr()
 augroup END
+noremap <leader>l :exe "buffer ".g:lastbuffer<CR>
+
+" Use Ctrl-C for buffer delete or quit vim ----------------{{{
+
+" Toggle behavior for the last buffer in the last window
+let g:quitVimWhenPressingCtrlC = 1
+function! ToggleQuit()
+  let g:quitVimWhenPressingCtrlC = g:quitVimWhenPressingCtrlC ? 0 : 1
+  let message = g:quitVimWhenPressingCtrlC ? "Unlock" : "Lock"
+  echo message
+endfunction
+nnoremap <leader><leader>gl :call ToggleQuit()<CR>
+
+function! CheckSave()
+  if &modified
+    let answer = confirm("Save changes?", "&Yes\n&No\n&Cancel")
+    if answer == 1 | write | endif
+    if answer == 3 | return | endif
+  endif
+
+  if len(getbufinfo({'buflisted': 1})) == 2
+    try | buffer # | bdelete! # | catch | endtry
+  else
+    bdelete!
+  endif
+endfunction
+func! QuitWithCheck()
+  if g:quitVimWhenPressingCtrlC
+    silent! quit
+  else
+    echo "Press <leader><leader>gl to allow quit with <C-c>"
+  endif
+endfunc
+function! Bye()
+  let windows = gettabinfo(tabpagenr())[0]['windows']
+  let bufs = gettabinfo(tabpagenr())[0]['variables']['bufs']
+  if len(windows) == 1 && len(bufs) == 1
+    echo 'quit'
+    call QuitWithCheck()
+  elseif &diff
+    call CloseBuffersForDiff()
+  else
+    echo 'bdelete'
+    call CheckSave()
+  endif
+endfunction
+nnoremap <silent> <C-c> :call Bye()<CR>
+
+"}}}
+" Diff Mode ----------------{{{
+
+function! CloseBuffersForDiff()
+    windo | if &diff && &buftype == "nofile" | bdelete | endif
+    norm! zv
+endfunction
+
+command! DiffOrig vert new | set buftype=nofile nobuflisted | read ++edit # | 0d_
+\ | diffthis | wincmd p | diffthis
 
 " Uset <C-w>d to toggle Diff mode
 function! s:SwitchDiff()
   if &diff
-    windo | if &buftype == "nofile" | bdelete | endif
+    call CloseBuffersForDiff()
   else
     DiffOrig
-    wincmd p | set nobuflisted | wincmd p
   endif
 endfunction
 com! SwitchDiff call s:SwitchDiff()
 nnoremap <C-w>d <Cmd>silent! SwitchDiff<CR>
 
 function! s:SwitchDiffForGitHEAD()
-  nmap cdg
+  norm cdg
   if &diff
     windo | if &buftype == "nofile" | bdelete | endif
+    norm! zv
   else
     vert new | set buftype=nofile nobuflisted
     read !git show HEAD:#
     0d_ | diffthis | wincmd p | diffthis
   endif
 endfunction
-com! SwitchDiffForGitHEAD call s:SwitchDiffForGitHEAD()
+command! SwitchDiffForGitHEAD call s:SwitchDiffForGitHEAD()
 nnoremap <C-w>D <Cmd>silent! SwitchDiffForGitHEAD<CR>
+
+" }}}
+
 " }}}
 " MANAGE_WINDOWS ----------------{{{
 
@@ -306,7 +323,41 @@ elseif has('nvim')
   tnoremap <m-q> <c-\><c-n>
 endif
 " }}}
-" FOLDING ----------------{{{
+" MANAGE_TABS ----------------{{{
+
+" Useful mappings for managing tabs
+map <leader>tn :tabnew<CR>
+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>
+
+" Let <leader>tl toggle between this and the last accessed tab
+let g:lasttab = 1
+nmap <Leader>tl :exe "tabn ".g:lasttab<CR>
+autocmd TabLeave * let g:lasttab = tabpagenr()
+
+" Opens a new tab with the current buffer's path
+" Super useful when editing files in the same directory
+map <leader>te :tabedit <C-r>=expand("%:p:h")<CR>
+
+" Tab move functions
+function! Tvab_MoveLeft()
+  let l:tabnr = tabpagenr() - 2
+  if l:tabnr >= 0
+    exec 'tabmove '.l:tabnr
+  endif
+endfunc
+function! Tab_MoveRight()
+  let l:tabnr = tabpagenr() + 1
+  if l:tabnr <= tabpagenr('$')
+    exec 'tabmove '.l:tabnr
+  endif
+endfunc
+" }}}
+" FOLD ----------------{{{
 
 " Set foldmethod
 noremap <leader><leader>fm :<C-\>e'set foldmethod='..&foldmethod<CR>
@@ -317,13 +368,19 @@ nnoremap zr zr:set foldlevel<CR>
 
 " Use l to open fold
 nnoremap <expr> l foldclosed('.') == -1 ? 'l' : 'zo'
-sourcesourcesource
+
 " Open fold in next line
 nnoremap <expr> zo foldclosed('.') == -1 ? 'zjzo' : 'zo'
 nnoremap <expr> zO foldclosed('.') == -1 ? 'zjzO' : 'zO'
 
 " }}}
-" SURROURD_WITH_CHAR ----------------{{{
+" SURROUND ----------------{{{
+
+inoremap ' ''<Left>
+inoremap " ""<Left>
+inoremap ( ()<Left>
+inoremap [ []<Left>
+inoremap { {}<Left>
 
 vnoremap S sa
 vnoremap ' <ESC>`<i'<ESC>`>la'<ESC>
@@ -403,7 +460,6 @@ let g:tig_explorer_keymap_commit_vsplit  = '<C-v>'
 nnoremap <C-t> <Cmd>Tig<CR>
 nnoremap <C-t>s <Cmd>TigStatus<CR>
 nnoremap <C-t>b <Cmd>TigBlame<CR>
-nnoremap <C-t>d :vertical TigOpenFileWithCommit <C-R>+ % 0<CR>
 
 " }}}
 " Markdown items (temproray solution) ----------------{{{
diff --git a/vim/lua/chadrc.lua b/vim/lua/chadrc.lua
index 6006371..f9c2357 100644
--- a/vim/lua/chadrc.lua
+++ b/vim/lua/chadrc.lua
@@ -5,7 +5,7 @@
 local M = {}
 
 M.ui = {
-  theme = "bearded-arc",
+  theme = "onedark",
 
   -- hl_override = {
   --    Comment = { italic = true },
@@ -33,15 +33,15 @@ M.ui = {
 -- For tabufline
 if M.ui.tabufline.enabled then
 
-  vim.keymap.set("n", "<C-c>", function()
-    local bufnrs = vim.tbl_filter(function(b) return 1 == vim.fn.buflisted(b) end, vim.api.nvim_list_bufs())
-    if #bufnrs == 1 or #vim.fn.getwininfo() > 1 then
-      vim.cmd("silent quit")
-    else
-      -- require("nvchad.tabufline").close_buffer()
-      vim.cmd("bdelete")
-    end
-  end, { desc = "buffer close" })
+  -- vim.keymap.set("n", "<C-c>", function()
+  --   local bufnrs = vim.tbl_filter(function(b) return 1 == vim.fn.buflisted(b) end, vim.api.nvim_list_bufs())
+  --   if #bufnrs == 1 or #vim.fn.getwininfo() > 1 then
+  --     vim.cmd("silent quit")
+  --   else
+  --     require("nvchad.tabufline").close_buffer()
+  --     -- vim.cmd("bdelete")
+  --   end
+  -- end, { desc = "buffer close" })
 
   for i = 1, 9, 1 do
     vim.keymap.set("n", string.format("<A-%s>", i), function()
@@ -57,5 +57,4 @@ if M.ui.tabufline.enabled then
 
 end
 
-
 return M
diff --git a/vim/lua/mappings.lua b/vim/lua/mappings.lua
index 159971c..07107e5 100644
--- a/vim/lua/mappings.lua
+++ b/vim/lua/mappings.lua
@@ -1,7 +1,7 @@
 -- For NvChad
 -- require "nvchad.mappings"
 vim.keymap.set("n", "<leader>ch", "<cmd>NvCheatsheet<CR>", { desc = "toggle nvcheatsheet" })
-vim.keymap.set("n", "<leader>th", "<cmd>Telescope themes<CR>", { desc = "telescope nvchad themes" })
+vim.keymap.set("n", "<leader><leader>th", "<cmd>Telescope themes<CR>", { desc = "telescope nvchad themes" })
 
 --  General
 vim.keymap.set("i", "jk", "<ESC>")