6 files changed, 227 insertions, 158 deletions

diff --git a/vim/init.vim b/vim/init.vim
index adfd9d6..fd65816 100644
--- a/vim/init.vim
+++ b/vim/init.vim
@@ -27,3 +27,5 @@ else
   LoadScript init/plugins.vim
   LoadScript init/style.vim
 endif
+
+highlight CursorLineNr term=bold cterm=bold ctermfg=226 gui=bold guifg=#eeee00
diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index c066f07..42dab16 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -76,19 +76,17 @@ set shiftwidth=2
 set cindent
 set ttimeout
 set ttimeoutlen=50
-" set updatetime=1000
+" set updatetime=4000
 " autocmd CursorHold * normal! m'
 
-imap <C-c> <Esc>l
-
 " TAB ----------------{{{
 
 set expandtab
 set softtabstop=-1
 
-" 顯示分隔符號
-set list
-set listchars=tab:��▷,extends:>,precedes:<
+" Invisible chars
+set nolist
+set listchars=tab:»��,extends:>,precedes:<
 
 " }}}
 
@@ -118,13 +116,27 @@ augroup vimStartup
   " (it's likely a different one than last time).
   autocmd BufReadPost *
         \ if line("'\"") >= 1 && line("'\"") <= line("$") && &ft !~# 'commit'
-        \ |   exe "normal! g`\"zv"
+        \ |   try | silent execute 'normal! g`"zv' | endtry
         \ | endif
 augroup END
 
 " }}}
 
 " }}}
+" 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"
+else
+  let g:defaut_foldcolumn = 5
+endif
+let &foldcolumn = g:defaut_foldcolumn
+
+" }}}
 " ENCODING_PREFERENCE ----------------{{{
 
 if has('multi_byte')
@@ -135,13 +147,6 @@ if has('multi_byte')
 endif
 
 " }}}
-" FOLD ----------------{{{
-
-set foldenable          " Allow fold
-set foldmethod=indent   " Fold contents by indent
-set foldlevel=2
-
-" }}}
 " BACKUP ----------------{{{
 
 " Allow backup
@@ -162,13 +167,6 @@ set writebackup
 syntax enable
 set conceallevel=1
 
-function! GetHighlightGroupName()
-  let l:syntaxID = synID(line('.'), col('.'), 1)
-  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 !?
 " highlight MatchParen ctermfg=NONE ctermbg=darkgrey cterm=NONE
@@ -178,14 +176,6 @@ highlight LuaParen ctermfg=NONE ctermbg=darkgrey cterm=NONE
 highlight ExtraWhitespace ctermbg=red guibg=red
 match ExtraWhitespace /\s\+$/
 
-" Persist visualized lines
-" define line highlight color
-highlight MultiLineHighlight ctermbg=LightYellow guibg=LightYellow ctermfg=Black guifg=Black
-" highlight the current line
-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 903d8a0..4e1c06c 100644
--- a/vim/init/config.vim
+++ b/vim/init/config.vim
@@ -5,6 +5,7 @@
 
 " Unnamed Buffer ----------------{{{
 
+" Automatically delete unnamed empty buffer when leaving
 augroup DeleteUnnamedEmptBuffer!
   au!
   au BufLeave {} if getline(1, '$') == [''] | setlocal bufhidden=wipe | endif
@@ -15,15 +16,14 @@ augroup END
 
 augroup TerminalSize
   au!
-  function! LayoutForSmall()
-    echo 'vim resized'
-    if &lines < 18
-      set cmdheight=0 laststatus=0 showtabline=0 signcolumn=no nowrap scrolloff=1
+  function! LayoutForSmallTerminal()
+    if &lines < 19
+      silent! set cmdheight=0 laststatus=0 showtabline=0 signcolumn=no nowrap scrolloff=1
     else
-      set cmdheight& laststatus& showtabline=2 signcolumn=yes scrolloff=3
+      silent! set cmdheight& laststatus& showtabline=2 signcolumn=yes scrolloff=3
     endif
   endfunction
-  autocmd VimResized * call LayoutForSmall()
+  autocmd VimEnter,VimResized * call LayoutForSmallTerminal()
 augroup END
 
 " }}}
@@ -144,24 +144,28 @@ augroup InitFileTypes
   autocmd BufReadPost * call <SID>ApplyShebang()
   " }}}
   " Markdown ----------------{{{
-  au FileType markdown setlocal wrap
-  au FileType markdown set sw=2 ts=2
-  " Fold by heading level
-  function! MarkdownLevel()
-    let hash_num = matchstr(getline(v:lnum), '^#\+')
-    let hash_num_at_top = matchstr(getline(v:lnum-1), '^#\+')
-    if empty(hash_num)
-      if empty(hash_num_at_top)
-        return "="
+
+  augroup Config_Markdown
+    au!
+    au FileType markdown setlocal wrap sw=2 ts=2
+    au FileType markdown setlocal foldexpr=MarkdownLevel() foldmethod=expr
+
+    " Fold by heading level
+    function! MarkdownLevel()
+      let hash_num = matchstr(getline(v:lnum), '^#\+')
+      let hash_num_at_top = matchstr(getline(v:lnum-1), '^#\+')
+      if empty(hash_num)
+        if empty(hash_num_at_top)
+          return "="
+        else
+          return ">"..(len(hash_num_at_top))
+        endif
       else
-        return ">"..(len(hash_num_at_top))
+        return len(hash_num) - 1
       endif
-    else
-      return len(hash_num)-1
-    endif
-  endfunction
-  au FileType markdown setlocal foldexpr=MarkdownLevel()
-  au FileType markdown setlocal foldmethod=expr
+    endfunction
+
+  augroup END
 
   " }}}
   " HTML ----------------{{{
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index f71ec7c..0132706 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -7,6 +7,9 @@
 " Space for searching
 map <space> /
 
+" Escape normal mode by <C-c>
+imap <C-c> <Esc>l
+
 " Search for selected test
 vnoremap * y/\V<C-R>=escape(@",'/\')<CR><CR>
 
@@ -23,10 +26,8 @@ nmap <leader>w :w!<CR>
 " (useful for handling the permission-denied error)
 command! W execute 'w !sudo -S tee %' <bar> edit!
 
-" Fast quit with error
+" Quit
 nmap <leader>q :q<CR>
-
-" Fast quit with error
 nmap cq :cq<CR>
 
 " Remap <CR> in Quickfix, Cmdwin Location list
@@ -88,7 +89,8 @@ nnoremap <C-k> ddkP
 " execute "set <M-h>=\eh"
 
 " Spell
-nnoremap <leader><leader>sp :set spell!<CR>
+nnoremap <expr> <leader><leader>sp ": echo spell "..(echo &spell ? "on" : "off").."<CR>"
+nnoremap <expr> <leader><leader>sp ": echo spell "
 nnoremap <leader>ss ]s
 nnoremap <leader>S [s
 
@@ -190,6 +192,10 @@ nnoremap <leader>ee :edit $MYVIMRC<CR>
 " Set options
 noremap <leader>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>
 
 " Open a new buffer
 nmap <leader>B :enew<CR>
@@ -213,43 +219,53 @@ function! ToggleQuit()
 endfunction
 nnoremap <leader><leader>gl :call ToggleQuit()<CR>
 
-function! CheckSave()
+function! CloseBufferSafely()
   if &modified
     let answer = confirm("Save changes?", "&Yes\n&No\n&Cancel")
     if answer == 1 | write | endif
     if answer == 3 | return | endif
   endif
 
-  bdelete!
-
-endfunction
-func! QuitWithCheck()
-  if g:quitVimWhenPressingCtrlC
-    silent! quit
+  let bufs = getbufinfo({'buflisted': 1})
+  if len(bufs) == 1
+    bdelete!
   else
-    echo "Press <leader><leader>gl to allow quit with <C-c>"
+    b# | bd! #
   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 windows = gettabinfo(tabpagenr())[0]['windows']
+try
   let bufs = gettabinfo(tabpagenr())[0]['variables']['bufs']
-
-  if len(windows) == 1 && len(bufs) == 1
-    call QuitWithCheck()
-  elseif &diff
-    call CloseBuffersForDiff()
-  else
-    call CheckSave()
-  endif
+catch
+  let bufs = getbufinfo({'buflisted': 1})
+endtry
+
+if len(windows) == 1 && len(bufs) == 1
+  call QuitWithCheck()
+elseif &diff
+  call CloseBuffersForDiff()
+elseif len(windows) >1
+  quit
+else
+ silent! call CloseBufferSafely()
+endif
 endfunction
 nnoremap <silent> <C-c> :call Bye()<CR>
 
-"}}}
-" Diff Mode ----------------{{{
+
+" Diff Mode ----------------
 
 function! CloseBuffersForDiff()
-    windo | if &diff && &buftype == "nofile" | bdelete | endif
-    norm! zv
+  windo | if &diff && &buftype == "nofile" | bdelete | endif
+  norm! zv
 endfunction
 
 command! DiffOrig vert new | set buftype=nofile nobuflisted | read ++edit # | 0d_
@@ -257,25 +273,25 @@ command! DiffOrig vert new | set buftype=nofile nobuflisted | read ++edit # | 0d
 
 " Uset <C-w>d to toggle Diff mode
 function! s:SwitchDiff()
-  if &diff
-    call CloseBuffersForDiff()
-  else
-    DiffOrig
-  endif
+if &diff
+  call CloseBuffersForDiff()
+else
+  DiffOrig
+endif
 endfunction
 com! SwitchDiff call s:SwitchDiff()
 nnoremap <C-w>d <Cmd>silent! SwitchDiff<CR>
 
 function! s:SwitchDiffForGitHEAD()
-  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
+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
 command! SwitchDiffForGitHEAD call s:SwitchDiffForGitHEAD()
 nnoremap <C-w>D <Cmd>silent! SwitchDiffForGitHEAD<CR>
@@ -301,22 +317,22 @@ inoremap <m-J> <esc><c-w>j
 inoremap <m-K> <esc><c-w>k
 
 if has('terminal') && exists(':terminal') == 2 && has('patch-8.1.1')
-  " vim 8.1 支持 termwinkey ，不需要把 terminal 切换成 normal 模式
-  " 设置 termwinkey 为 CTRL 加减号（GVIM），有些终端下是 CTRL+?
-  " 后面四个键位是搭配 termwinkey 的，如果 termwinkey 更改，也要改
-  set termwinkey=<c-_>
-  tnoremap <m-H> <c-_>h
-  tnoremap <m-L> <c-_>l
-  tnoremap <m-J> <c-_>j
-  tnoremap <m-K> <c-_>k
-  tnoremap <m-q> <c-\><c-n>
+" vim 8.1 支持 termwinkey ，不需要把 terminal 切换成 normal 模式
+" 设置 termwinkey 为 CTRL 加减号（GVIM），有些终端下是 CTRL+?
+" 后面四个键位是搭配 termwinkey 的，如果 termwinkey 更改，也要改
+set termwinkey=<c-_>
+tnoremap <m-H> <c-_>h
+tnoremap <m-L> <c-_>l
+tnoremap <m-J> <c-_>j
+tnoremap <m-K> <c-_>k
+tnoremap <m-q> <c-\><c-n>
 elseif has('nvim')
-  " neovim 没有 termwinkey 支持，必须把 terminal 切换回 normal 模式
-  tnoremap <m-H> <c-\><c-n><c-w>h
-  tnoremap <m-L> <c-\><c-n><c-w>l
-  tnoremap <m-J> <c-\><c-n><c-w>j
-  tnoremap <m-K> <c-\><c-n><c-w>k
-  tnoremap <m-q> <c-\><c-n>
+" neovim 没有 termwinkey 支持，必须把 terminal 切换回 normal 模式
+tnoremap <m-H> <c-\><c-n><c-w>h
+tnoremap <m-L> <c-\><c-n><c-w>l
+tnoremap <m-J> <c-\><c-n><c-w>j
+tnoremap <m-K> <c-\><c-n><c-w>k
+tnoremap <m-q> <c-\><c-n>
 endif
 " }}}
 " MANAGE_TABS ----------------{{{
@@ -341,35 +357,44 @@ 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
+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
+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>
+noremap <leader><leader>fc :<C-\>e'set foldcolumn='..&foldcolumn<CR>
 
 " Show fold level when it changes
 nnoremap zm zm:set foldlevel<CR>
 nnoremap zr zr:set foldlevel<CR>
 
 " Fold file except selection
+let g:original_foldmethod = ""
 function! UnfoldSelectionOnly()
-  set foldmethod=manual
+  echo 'Unfold'..&foldmethod
+  let g:original_foldmethod = &foldmethod
+  let &foldmethod = "manual"
   norm! zE
   execute "0,'<-1fold"
   execute "'>+1,$fold"
 endfunction
-vnoremap zF :call UnfoldSelectionOnly()<CR>
+function! ResumeFoldmethod()
+  norm! zE
+  let &foldmethod = g:original_foldmethod ? g:original_foldmethod : "indent"
+endfunc
+vnoremap zF :<C-u>call UnfoldSelectionOnly()<CR>
+nnoremap zF :<C-u>call ResumeFoldmethod()<CR>
 
 " Use l to open fold
 nnoremap <expr> l foldclosed('.') == -1 ? 'l' : 'zo'
@@ -379,6 +404,36 @@ nnoremap <expr> zo foldclosed('.') == -1 ? 'zjzo' : 'zo'
 nnoremap <expr> zO foldclosed('.') == -1 ? 'zjzO' : 'zO'
 
 " }}}
+" HIGHLIGHT ----------------{{{
+
+function! HiFile()
+  let i = 1
+  while i <= line("$")
+    if strlen(getline(i)) > 0 && len(split(getline(i))) > 2
+      let w = split(getline(i))[0]
+      let l:command =  "syn match " . w . " /^" . w . "\\s\\+xxx/"
+      exe l:command
+    endif
+    let i += 1
+  endwhile
+endfunction
+
+function! GetHighlightGroupName()
+  let l:syntaxID = synID(line('.'), col('.'), 1)
+  let l:groupName = synIDattr(l:syntaxID, 'name')
+  echo "Highlight Group Name: " . l:groupName
+endfunction
+nnoremap <leader>H :call GetHighlightGroupName()<CR>
+
+" Persist visualized lines
+" define line highlight color
+highlight MultiLineHighlight ctermbg=LightYellow guibg=LightYellow ctermfg=Black guifg=Black
+" highlight the current line
+nnoremap <silent> <leader>gh :call matchadd('MultiLineHighlight', '\%'.line('.').'l')<CR>
+" clear all the highlighted lines
+nnoremap <silent> <leader>gH :call clearmatches()<CR>
+
+" }}}
 " SURROUND ----------------{{{
 
 inoremap ' ''<Left>
@@ -398,6 +453,11 @@ vnoremap <space> <ESC>`<i<space><ESC>`>la<space><ESC>
 vnoremap Q <ESC>`<i「<ESC>`>la」<ESC>
 
 " }}}
+" QUICKFIX ----------------{{{
+nnoremap <leader>cn :cn<CR>
+nnoremap <leader>cp :cp<CR>
+nnoremap <leader>cw :cw 10<CR>
+" }}}
 " REDIRECTION_WITH_BUFFER ----------------{{{
 
 " Usage:
diff --git a/vim/init/style.vim b/vim/init/style.vim
index f2b1a5a..7c65e82 100644
--- a/vim/init/style.vim
+++ b/vim/init/style.vim
@@ -8,6 +8,7 @@
 "======================================================================
 " vim: set ts=4 sw=4 tw=78 noet :
 
+colorscheme desert
 
 "----------------------------------------------------------------------
 " 显示设置
diff --git a/vim/lua/chadrc.lua b/vim/lua/chadrc.lua
index f9c2357..4b65f52 100644
--- a/vim/lua/chadrc.lua
+++ b/vim/lua/chadrc.lua
@@ -5,56 +5,68 @@
 local M = {}
 
 M.ui = {
-  theme = "onedark",
+        theme = "onedark",
+        hl_override = {
+                CursorLineNr = { fg = "#eeee00" },
+        },
 
-  -- hl_override = {
-  --    Comment = { italic = true },
-  --    ["@comment"] = { italic = true },
-  -- },
-  tabufline = {
-    enabled = true,
-    order = { "treeOffset", "buffers", "tabs" },
-  },
+        -- hl_override = {
+        --      Comment = { italic = true },
+        --      ["@comment"] = { italic = true },
+        -- },
+        tabufline = {
+                enabled = true,
+                order = { "treeOffset", "buffers", "tabs" },
+        },
 
-  term = {
-    hl = "Normal:term,WinSeparator:WinSeparator",
-    sizes = { sp = 0.4, vsp = 0.4 },
-    float = {
-      relative = "editor",
-      row = 0.15,
-      col = 0.13,
-      width = 0.7,
-      height = 0.7,
-      border = "single",
-    },
-  },
+        term = {
+                hl = "Normal:term,WinSeparator:WinSeparator",
+                sizes = { sp = 0.4, vsp = 0.4 },
+                float = {
+                        relative = "editor",
+                        row = 0.15,
+                        col = 0.13,
+                        width = 0.7,
+                        height = 0.7,
+                        border = "single",
+                },
+        },
 }
 
 -- For tabufline
 if M.ui.tabufline.enabled then
+        vim.api.nvim_exec(
+                [[
+    function! CloseBufferSafely()
+     lua require("nvchad.tabufline").close_buffer()
+    endfunction
+  ]],
+                false
+        )
 
-  -- 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()
-      vim.api.nvim_set_current_buf(vim.t.bufs[i])
-    end)
-  end
-  vim.keymap.set("n", "<A-h>", function() require("nvchad.tabufline").move_buf(-1) end)
-  vim.keymap.set("n", "<A-l>", function() require("nvchad.tabufline").move_buf(1) end)
-  vim.keymap.set("n", "<A-H>", function() vim.cmd("tabprevious") end)
-  vim.keymap.set("n", "<A-L>", function() vim.cmd("tabnext") end)
-  vim.keymap.set("n", "<tab>", function() require("nvchad.tabufline").next() end, { desc = "buffer goto next" })
-  vim.keymap.set("n", "<S-tab>", function() require("nvchad.tabufline").prev() end, { desc = "buffer goto prev" })
-
+        for i = 1, 9, 1 do
+                vim.keymap.set("n", string.format("<A-%s>", i), function()
+                        vim.api.nvim_set_current_buf(vim.t.bufs[i])
+                end)
+        end
+        vim.keymap.set("n", "<A-h>", function()
+                require("nvchad.tabufline").move_buf(-1)
+        end)
+        vim.keymap.set("n", "<A-l>", function()
+                require("nvchad.tabufline").move_buf(1)
+        end)
+        vim.keymap.set("n", "<A-H>", function()
+                vim.cmd("tabprevious")
+        end)
+        vim.keymap.set("n", "<A-L>", function()
+                vim.cmd("tabnext")
+        end)
+        vim.keymap.set("n", "<tab>", function()
+                require("nvchad.tabufline").next()
+        end, { desc = "buffer goto next" })
+        vim.keymap.set("n", "<S-tab>", function()
+                require("nvchad.tabufline").prev()
+        end, { desc = "buffer goto prev" })
 end
 
 return M