3 files changed, 43 insertions, 17 deletions

diff --git a/vim/init/config.vim b/vim/init/config.vim
index 1910004..ae623ec 100644
--- a/vim/init/config.vim
+++ b/vim/init/config.vim
@@ -1,11 +1,14 @@
 "======================================================================
-" init-config.vim - 正常模式下的配置，在 init-basic.vim 后调用
+" init-config.vim
+" Do some autocommand for by contexts
 "======================================================================
 
-" foo Unnamed Buffer ----------------{{{
+" Unnamed Buffer ----------------{{{
+
 augroup DeleteUnnamedEmptBuffer!
   au BufLeave {} if getline(1, '$') == [''] | setlocal bufhidden=wipe | endif
 augroup END
+
 " }}}
 " X11 ----------------{{{
 
@@ -99,7 +102,7 @@ call s:key_escape('<S-F12>', '[24;2~')
 augroup InitFileTypes
 
   au!
-source
+
   " Filetype for Vim ----------------{{{
 
   " Help page
@@ -174,7 +177,9 @@ source
 
   " }}}
   " Mail ----------------{{{
+
   autocmd BufRead /tmp/mutt-* set tw=72
+
   " }}}
   " Password ----------------{{{
 
@@ -194,7 +199,6 @@ source
   " }}}
   " Beancount ----------------{{{
 
-  " Set filetype for beancount
   autocmd BufRead,BufNewFile *.bean call PrepareBean()
   function PrepareBean()
     set filetype=beancount
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index 6978f63..f46e67b 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -8,23 +8,12 @@
 " Space for searching
 map <space> /
 
-" 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')
-
 " Search for selected test
 vnoremap * y/\V<C-R>=escape(@",'/\')<CR><CR>
 
-" set buflisted
-noremap <leader>st :set<space>
-
 " Disable highlight when <leader><CR> is pressed
 map <silent> <leader><CR> :noh<CR>
 
-" Quick move in a line
-noremap <C-h> 30h
-noremap <C-l> 30l
-
 " Paste register 0
 nnoremap <C-p> "0p
 
@@ -99,7 +88,7 @@ nnoremap <leader>P :r !xsel -ob<CR>
 vnoremap Y :w !xsel -ib<CR>
 
 " Spell
-nnoremap <leader>ts :set spell!<CR>
+nnoremap <leader><leader>sp :set spell!<CR>
 nnoremap <leader>ss ]s
 nnoremap <leader>S [s
 
@@ -116,12 +105,26 @@ nnoremap <leader><leader>so :source ~/.vimrc<CR>
 vnoremap so :source<CR>
 
 " }}}
+" MOVE ----------------{{{
+
+" 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')
+
+" Quick move in a line
+noremap <C-h> 30h
+noremap <C-l> 30l
+
+" }}}
 " MANAGE_VIMRC ----------------{{{
+
 nnoremap <leader>e :scriptnames<space>
 nnoremap <leader>ee :edit $MYVIMRC<CR>
 autocmd! BUFWRITEPOST $MYVIMRC source $MYVIMRC
+
 " }}}
 " MOVING_WITH_READLINE ----------------{{{
+
 inoremap <C-f> <Right>
 inoremap <C-b> <Left>
 inoremap <C-a> <C-o>0
@@ -155,13 +158,16 @@ 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>
 noremap <silent><A-2> :tabn 2<CR>
 noremap <silent><M-3> :tabn 3<CR>
@@ -180,6 +186,7 @@ inoremap <silent><M-6> <Esc>:tabn 6<CR>
 inoremap <silent><M-7> <Esc>:tabn 7<CR>
 inoremap <silent><M-8> <Esc>:tabn 8<CR>
 inoremap <silent><M-9> <Esc>:tablast<CR>
+
 " }}}
 " MANAGE_TABS ----------------{{{
 
@@ -217,6 +224,9 @@ endfunc
 " }}}
 " MANAGE_BUFFERS ----------------{{{
 
+" set buflisted
+noremap <leader>st :set<space>
+
 " Open a new buffer
 nmap <leader><leader>b :enew<CR>
 nmap <leader>B :enew<CR>
@@ -261,6 +271,7 @@ com! SwitchDiffForGitHEAD call s:SwitchDiffForGitHEAD()
 nnoremap <C-w>D <Cmd>silent! SwitchDiffForGitHEAD<CR>
 " }}}
 " MANAGE_WINDOWS ----------------{{{
+
 nnoremap <leader><leader>sb :windo set scrollbind!<CR>
 
 " 窗口切换：ALT+SHIFT+hjkl
@@ -296,19 +307,24 @@ elseif has('nvim')
 endif
 " }}}
 " FOLDING ----------------{{{
+
 " Set foldmethod
 noremap <leader><leader>fm :<C-\>e'set foldmethod='..&foldmethod<CR>
 
 " Show fold level when it changes
 nnoremap zm zm:set foldlevel<CR>
 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 ----------------{{{
+
 vnoremap S sa
 vnoremap ' <ESC>`<i'<ESC>`>la'<ESC>
 vnoremap q <ESC>`<i"<ESC>`>la"<ESC>
@@ -318,6 +334,7 @@ vnoremap { <ESC>`<i{<ESC>`>la}<ESC>
 vnoremap ` <ESC>`<i`<ESC>`>la`<ESC>
 vnoremap <space> <ESC>`<i<space><ESC>`>la<space><ESC>
 vnoremap Q <ESC>`<i「<ESC>`>la」<ESC>
+
 " }}}
 " REDIRECTION_WITH_BUFFER ----------------{{{
 
@@ -380,12 +397,14 @@ vnoremap <CR> <Cmd>call SubstituteBySearch()<CR>
 
 " }}}
 " GIT_TIG ----------------{{{
+
 let g:tig_explorer_keymap_commit_split   = '<C-s>'
 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) ----------------{{{
 
@@ -401,8 +420,10 @@ nnoremap <C-t>d :vertical TigOpenFileWithCommit <C-R>+ % 0<CR>
 nnoremap <leader>dd :r !sh -c 'LANG=en zenity --calendar --date-format="\%Y.\%m.\%d" 2>/dev/null'<CR><CR>
 nnoremap <leader>dD :r !sh -c 'LANG=en zenity --calendar --date-format="\%a \%b \%d" 2>/dev/null'<CR><CR>
 nnoremap <leader>dt :r !date +\%H:\%m<CR>A
+
 " }}}
 " Compile ----------------{{{
+
 " 编译运行 C/C++ 项目
 " 详细见：http://www.skywind.me/blog/archives/2084
 "----------------------------------------------------------------------
@@ -506,4 +527,5 @@ else
         \ --include='*.js' --include='*.vim'
         \ '<root>' <CR>
 endif
+
 " }}}
diff --git a/vim/lua/chadrc.lua b/vim/lua/chadrc.lua
index e19b897..6006371 100644
--- a/vim/lua/chadrc.lua
+++ b/vim/lua/chadrc.lua
@@ -5,7 +5,7 @@
 local M = {}
 
 M.ui = {
-  theme = "onedark",
+  theme = "bearded-arc",
 
   -- hl_override = {
   --    Comment = { italic = true },