Update

4 files changed, 109 insertions, 141 deletions

diff --git a/vim/init.vim b/vim/init.vim
index f2c7bb3..031a0ed 100644
--- a/vim/init.vim
+++ b/vim/init.vim
@@ -8,6 +8,7 @@ endif
 " Get current dir
 " let s:home = fnamemodify(resolve(expand('<sfile>:p')), ':h')
 let s:home = '~/helper/vim'
+execute 'cd '.s:home
 
 " Load script in current dir
 " command! -nargs=1 LoadScript exec 'source '.s:home.'/'.'<args>'
@@ -15,28 +16,24 @@ let s:home = '~/helper/vim'
 " Add current dir into runtimepath
 execute 'set runtimepath+='.s:home
 
-
 "----------------------------------------------------------------------
-" Locad Modules
+" Locad Scripts
 "----------------------------------------------------------------------
 
 " Basic configuration
-source ~/helper/vim/init/basic.vim
+source init/basic.vim
 
 " Key mappings
-source ~/helper/vim/init/keymaps.vim
+source init/keymaps.vim
 
 " Extra config for different contexts
-source ~/helper/vim/init/config.vim
-
-" Highlight
-source ~/helper/vim/init/special_highlight.vim
+source init/config.vim
 
 if has('nvim')
   " For neovim
-  source ~/helper/vim/lazy.lua
+  source lazy.lua
 else
   " For vim
-  source ~/helper/vim/init/plugins.vim
-  source ~/helper/vim/init/style.vim
+  source init/plugins.vim
+  source init/style.vim
 endif
diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index b268c6b..e18423d 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -120,12 +120,7 @@ endfunction
 nnoremap <silent> <C-c> :call Bye()<CR>
 
 " }}}
-
-" Don't unload a buffer when no longer shown in a window
-" This allows you open a new buffer and leaves current buffer modified
-set hidden
-
-" ":augroup vimStartup | au! | augroup END"
+" Go to last cursor position ----------------{{{
 augroup vimStartup
   au!
   " When editing a file, always jump to the last known cursor position.
@@ -139,6 +134,7 @@ augroup vimStartup
 augroup END
 
 " }}}
+" }}}
 " TABSIZE ----------------{{{
 
 set expandtab
@@ -178,6 +174,32 @@ set backupdir=~/.vim/tmp
 " backup when write file
 set writebackup
 " }}}
+" HIGHLIGHT ----------------{{{
+syntax enable
+
+function! GetHighlightGroupName()
+  let l:syntaxID = synID(line('.'), col('.'), 1)
+  let l:groupName = synIDattr(l:syntaxID, 'name')
+  echo "Highlight Group Name: " . l:groupName
+endfunction
+
+" 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
+highlight LuaParen ctermfg=NONE ctermbg=darkgrey cterm=NONE
+
+" Show trailing spaces
+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 ----------------{{{
 
 " Use Unix way to add newline
diff --git a/vim/init/config.vim b/vim/init/config.vim
index ec9f090..b34ed81 100644
--- a/vim/init/config.vim
+++ b/vim/init/config.vim
@@ -1,29 +1,40 @@
 "======================================================================
-"
 " init-config.vim - 正常模式下的配置，在 init-basic.vim 后调用
-"
-" Created by skywind on 2018/05/30
-" Last Modified: 2018/05/30 19:20:46
-"
 "======================================================================
 
-"----------------------------------------------------------------------
-"
-"----------------------------------------------------------------------
-augroup LeavingBuffer!
+" Unnamed Buffer ----------------{{{
+augroup DeleteUnnamedEmptBuffer!
   au BufLeave {} if getline(1, '$') == [''] | setlocal bufhidden=wipe | endif
 augroup END
+" }}}
+" TMUX ----------------{{{
 
-
-"----------------------------------------------------------------------
 " 有 tmux 何没有的功能键超时（毫秒）
-"----------------------------------------------------------------------
 if $TMUX != ''
   set ttimeoutlen=30
 elseif &ttimeoutlen > 80 || &ttimeoutlen <= 0
   set ttimeoutlen=80
 endif
 
+" 防止tmux下vim的背景色显示异常
+" Refer: http://sunaku.github.io/vim-256color-bce.html
+if &term =~ '256color' && $TMUX != ''
+  " disable Background Color Erase (BCE) so that color schemes
+  " render properly when inside 256-color tmux and GNU screen.
+  set t_ut=
+endif
+
+
+" Ref: https://gist.github.com/andersevenrud/015e61af2fd264371032763d4ed965b6
+" You might have to force true color when using regular vim inside tmux as the
+" colorscheme can appear to be grayscale with 'termguicolors' option enabled.
+if !has('gui_running') && &term =~ '^\%(screen\|tmux\)'
+  let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+  let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
+endif
+
+" }}}
+" KeyCode ----------------{{{
 
 "----------------------------------------------------------------------
 " 终端下允许 ALT，详见：http://www.skywind.me/blog/archives/2021
@@ -50,9 +61,8 @@ if has('nvim') == 0 && has('gui_running') == 0
   endfor
 endif
 
-
 "----------------------------------------------------------------------
-" 终端下功能键设���
+" 功能键���端码矫正
 "----------------------------------------------------------------------
 function! s:key_escape(name, code)
   if has('nvim') == 0 && has('gui_running') == 0
@@ -60,10 +70,6 @@ function! s:key_escape(name, code)
   endif
 endfunc
 
-
-"----------------------------------------------------------------------
-" 功能键终端码矫正
-"----------------------------------------------------------------------
 call s:key_escape('<F1>', 'OP')
 call s:key_escape('<F2>', 'OQ')
 call s:key_escape('<F3>', 'OR')
@@ -81,55 +87,23 @@ call s:key_escape('<S-F10>', '[21;2~')
 call s:key_escape('<S-F11>', '[23;2~')
 call s:key_escape('<S-F12>', '[24;2~')
 
-
-"----------------------------------------------------------------------
-" 防止tmux下vim的背景色显示异常
-" Refer: http://sunaku.github.io/vim-256color-bce.html
-"----------------------------------------------------------------------
-if &term =~ '256color' && $TMUX != ''
-  " disable Background Color Erase (BCE) so that color schemes
-  " render properly when inside 256-color tmux and GNU screen.
-  set t_ut=
-endif
-
-" Ref: https://gist.github.com/andersevenrud/015e61af2fd264371032763d4ed965b6
-" You might have to force true color when using regular vim inside tmux as the
-" colorscheme can appear to be grayscale with 'termguicolors' option enabled.
-if !has('gui_running') && &term =~ '^\%(screen\|tmux\)'
-  let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
-  let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
-endif
-
-
-"----------------------------------------------------------------------
-" 配置微调
-"----------------------------------------------------------------------
-
-" 打开文件时恢复上一次光标所在位置
-autocmd BufReadPost *
-      \ if line("'\"") > 1 && line("'\"") <= line("$") |
-      \  exe "normal! g`\"" |
-      \ endif
-
-" 定义一个 DiffOrig 命令用于查看文件改动
-if !exists(":DiffOrig")
-  command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis
-        \ | wincmd p | diffthis
-endif
-
-
-"----------------------------------------------------------------------
-" 文件类型微调
+" }}}
+" Filetype ----------------{{{
 "----------------------------------------------------------------------
 augroup InitFileTypesGroup
 
-  " 清除同组的历史 autocommand
   au!
 
-  " help page: open in a new tab
+  " Filetype for Vim ----------------{{{
+
+  " Help page
   autocmd BufEnter *.txt if &filetype == 'help' | wincmd T | endif
 
-  " shegang: Automatically apply filetype by shebang
+  " quickfix: hide line number
+  autocmd FileType quickfix setlocal nonumber
+
+  " }}}
+  " Shebeng: Set filetype from shebeng ----------------{{{
   function! s:ApplyShebang()
     let l:filetype = matchstr(getline(1), '^#!.*[ /]\zs[[:alnum:]]\+$')
     let l:shebangMatch = #{ node: "javascript" }
@@ -142,8 +116,31 @@ augroup InitFileTypesGroup
     endif
   endfunction
   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 "="
+      else
+        return ">"..(len(hash_num_at_top))
+      endif
+    else
+      return len(hash_num)-1
+    endif
+  endfunction
+  au FileType markdown setlocal foldexpr=MarkdownLevel()
+  au FileType markdown setlocal foldmethod=expr
+
+  " }}}
+  " HTML ----------------{{{
 
-  " html: Quickly edit html tag class
+  " Usage: <leader>cl(ass) or <leader>id to edit html tag attribute
   function! s:ChangeAttr(pattern)
     let l:attr = matchstr(getline('.'), a:pattern.'="')
     if l:attr == ''
@@ -160,29 +157,20 @@ augroup InitFileTypesGroup
       startinsert
     endif
   endfunction
-  " Edit class and id for javascript files
   autocmd FileType html,markdown nnoremap <buffer> <leader>cl :call <SID>ChangeAttr("class")<CR>
   autocmd FileType html,markdown nnoremap <buffer> <leader>id :call <SID>ChangeAttr("id")<CR>
 
-  " 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 "="
-      else
-        return ">"..(len(hash_num_at_top))
-      endif
-    else
-      return len(hash_num)-1
-    endif
+  " Reload preview server
+  autocmd BufWrite *.html,*.js,*.css call ReloadServer()
+  function ReloadServer()
+    silent !browser-sync reload &>/dev/null
   endfunction
-  au FileType markdown setlocal foldexpr=MarkdownLevel()
-  au FileType markdown setlocal foldmethod=expr
+
+  " }}}
+  " Mail ----------------{{{
+  autocmd BufRead /tmp/mutt-* set tw=72
+  " }}}
+  " 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
@@ -197,6 +185,8 @@ augroup InitFileTypesGroup
     setlocal foldtext=s:custom()
     norm! ggzfl
   endfunction
+  " }}}
+  " Beancount ----------------{{{
 
   " Set filetype for beancount
   autocmd BufRead,BufNewFile *.bean call PrepareBean()
@@ -206,21 +196,8 @@ augroup InitFileTypesGroup
     autocmd VimLeave * silent !killall fava
   endfunction
 
-  " Set filetype for index.html
-  autocmd BufWrite *.html,*.js,*.css call ReloadServer()
-  function ReloadServer()
-    silent !browser-sync reload &>/dev/null
-  endfunction
-
-  " quickfix: hide line number
-  au FileType quickfix setlocal nonumber
-
-  " 强制对某些扩展名的 filetype 进行纠正
-  au BufNewFile,BufRead *.as setlocal filetype=actionscript
-  au BufNewFile,BufRead *.pro setlocal filetype=prolog
-  au BufNewFile,BufRead *.es setlocal filetype=erlang
-  au BufNewFile,BufRead *.asc setlocal filetype=asciidoc
-  au BufNewFile,BufRead *.vl setlocal filetype=verilog
-  au BufRead /tmp/mutt-* set tw=72
+  " }}}
 
 augroup END
+
+" }}}
diff --git a/vim/init/special_highlight.vim b/vim/init/special_highlight.vim
deleted file mode 100644
index 26d2787..0000000
--- a/vim/init/special_highlight.vim
+++ /dev/null
@@ -1,28 +0,0 @@
-"----------------------------------------------------------------------
-" SYNTAX_HIGHLIGHT
-"----------------------------------------------------------------------
-
-syntax enable
-
-function! GetHighlightGroupName()
-  let l:syntaxID = synID(line('.'), col('.'), 1)
-  let l:groupName = synIDattr(l:syntaxID, 'name')
-  echo "Highlight Group Name: " . l:groupName
-endfunction
-
-" 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
-highlight LuaParen ctermfg=NONE ctermbg=darkgrey cterm=NONE
-
-" Show trailing spaces
-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>