Update

4 files changed, 88 insertions, 85 deletions

diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index 83b4ae8..c7043dd 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -88,10 +88,10 @@ set whichwrap=b,s
 set showtabline=2
 
 " Side column
-set  number relativenumber
+set number relativenumber
 
 " Cursor
-" set cursorline
+set cursorline
 set guicursor=n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20
 set matchtime=2
 
@@ -223,15 +223,7 @@ set writebackup
 syntax enable
 set syntax=filetype
 set conceallevel=2
-
-" 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
-hi LuaParen ctermfg=NONE ctermbg=darkgrey cterm=NONE
-
-" Show trailing spaces
-match ExtraWhitespace /\s\+$/
-hi ExtraWhitespace ctermbg=red guibg=red
+set concealcursor=
 
 " }}}
 " MISC {{{
diff --git a/vim/init/config.vim b/vim/init/config.vim
index 8c75de9..8d84ff1 100644
--- a/vim/init/config.vim
+++ b/vim/init/config.vim
@@ -145,71 +145,66 @@ augroup InitFileTypes
   " }}}
   " Markdown {{{
 
-  augroup Config_Markdown
-    au!
-
-    au FileType markdown call InitMarkdownFile()
-    function! InitMarkdownFile()
-      setlocal wrap sw=2 ts=2
-      let g:markdown_apply_heading_level = 0
-      nnoremap \fl :let markdown_apply_heading_level = !markdown_apply_heading_level<CR>zX
-
-      let b:in_frontmatter = 0
-      setlocal foldexpr=MarkdownLevel() foldmethod=expr
-      setlocal foldtext=MarkdownFoldTextHeading()
-
-      call MarkdownHighlights()
-    endfunc
-
-    function! MarkdownHighlights()
-      syn match MarkdownHtmlDetails '^<details>' conceal cchar=▶
-      syn match MarkdownHtmlSummary '<summary>' conceal cchar= 
-      syn match MarkdownHtmlSummaryEnd '</summary>' conceal
-      syn match MarkdownHtmlDetailsEnd '^</details>' conceal cchar=E
-    endfunc
-
-    function! MarkdownLevel()
-      " For frontmatter
-      if v:lnum == 1 && getline(1) =~ '^---'
-        let b:in_frontmatter = 1
-        return '>1'
-      endif
-      if b:in_frontmatter
-        if getline(v:lnum) =~ '^---'
-          let b:in_frontmatter = 0
-          return '<1'
-        else
-          return '='
-        endif
-      endif
+  au FileType markdown call InitMarkdownFile()
+  function! InitMarkdownFile()
+    setlocal wrap sw=2 ts=2
+    let g:markdown_apply_heading_level = 0
+    nnoremap \fl :let markdown_apply_heading_level = !markdown_apply_heading_level<CR>zX
+
+    let b:in_frontmatter = 0
+    setlocal foldexpr=MarkdownLevel() foldmethod=expr
+    setlocal foldtext=MarkdownFoldTextHeading()
+
+    call MarkdownHighlights()
+  endfunc
+
+  function! MarkdownHighlights()
+    syn match MarkdownHtmlDetails '^<details>' conceal cchar=▶
+    syn match MarkdownHtmlSummary '<summary>' conceal cchar= 
+    syn match MarkdownHtmlSummaryEnd '</summary>' conceal
+    syn match MarkdownHtmlDetailsEnd '^</details>' conceal cchar=E
+  endfunc
 
-      " Fold for heading and the following contents
-      let hash_num = matchstr(getline(v:lnum), '^#\+')
-      if !empty(hash_num)
-        let foldlevel = g:markdown_apply_heading_level ? len(hash_num) - 1 : 1
-        " HEADING
-        return len(hash_num) == 1 ? 0 : '>'.foldlevel
+  function! MarkdownLevel()
+    " For frontmatter
+    if v:lnum == 1 && getline(1) =~ '^---'
+      let b:in_frontmatter = 1
+      return '>1'
+    endif
+    if b:in_frontmatter
+      if getline(v:lnum) =~ '^---'
+        let b:in_frontmatter = 0
+        return '<1'
       else
-        " Contents
-        return "="
+        return '='
       endif
-    endfunc
+    endif
 
-    function! MarkdownFoldTextHeading()
-      " For frontmatter
-      if v:foldstart == 1 && getline(v:foldstart) =~ '^---'
-        return '===FrontMatter==='
-      endif
+    " Fold for heading and the following contents
+    let hash_num = matchstr(getline(v:lnum), '^#\+')
+    if !empty(hash_num)
+      let foldlevel = g:markdown_apply_heading_level ? len(hash_num) - 1 : 1
+      " HEADING
+      return len(hash_num) == 1 ? 0 : '>'.foldlevel
+    else
+      " Contents
+      return "="
+    endif
+  endfunc
 
-      " For heading, foltext()
-      let origin = split(MarkdownFoldText()[2:], ' ')
-      let heading = substitute(join(origin[:-3], ' '), '\#', '  ', 'g')
-      let lines = origin[-2][1:]
-      let fills = repeat('.', 48 - strwidth(heading) - len(lines))
-      return heading.."  "..fills.."  "..lines
-    endfunc
+  function! MarkdownFoldTextHeading()
+    " For frontmatter
+    if v:foldstart == 1 && getline(v:foldstart) =~ '^---'
+      return '===FrontMatter==='
+    endif
 
-  augroup END
+    " For heading, foltext()
+    let origin = split(MarkdownFoldText()[2:], ' ')
+    let heading = substitute(join(origin[:-3], ' '), '\#', '  ', 'g')
+    let lines = origin[-2][1:]
+    let fills = repeat('.', 48 - strwidth(heading) - len(lines))
+    return heading.."  "..fills.."  "..lines
+  endfunc
 
   " }}}
   " HTML {{{
@@ -255,9 +250,12 @@ augroup InitFileTypes
   function! SetPasswordFile()
     setlocal foldminlines=0
     setlocal foldmethod=manual
-    setlocal foldtext="Password"
+    setlocal foldtext=PasswordFoldtext()
     norm! ggzfl
   endfunc
+  function! PasswordFoldtext()
+    return "---Password---"
+  endfunc
   " }}}
   " Beancount {{{
 
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index a28ce09..95d4c18 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -12,11 +12,11 @@ map <space> /
 inoremap <C-c> <Esc>l
 
 " Set wrap
-nnoremap \w :set wrap!<CR>
+nnoremap \w :set wrap!<CR>:set wrap?<CR>
 
 " Fast saving
 function! s:WriteOrEnterFileName()
-  if !empty(expand('%')) | write! | else | call feedkeys(":w ") | endif
+  if !empty(bufname('%')) | write! | else | call feedkeys(":w ") | endif
 endfunction
 nnoremap <leader>w :call <SID>WriteOrEnterFileName()<CR>
 
@@ -37,7 +37,7 @@ augroup vimrc_CRfix
 augroup END
 
 " Spell
-nnoremap \sp :set spell!<CR>:set spell?<CR>
+nnoremap \\sp :set spell!<CR>:set spell?<CR>
 
 " Show full path by default
 nnoremap <C-g> 1<C-g>
@@ -93,7 +93,6 @@ nnoremap <C-h> 30h
 nnoremap <C-l> 30l
 
 " File under the cursor
-nnoremap <CR> gf
 nnoremap gF :e <cfile><CR>
 
 xnoremap iq i"
@@ -160,6 +159,12 @@ inoremap <silent><M-9> <Esc>:tablast<CR>
 " }}}
 " EDIT {{{
 
+" Set text width for auto wrapping
+nnoremap <leader><leader>tw :set fo+=t<CR>:<C-\>e'set tw='..&tw<CR>
+
+" Set columns
+nnoremap <leader><leader>co :<C-\>e'set columns='..&co<CR>
+
 " Move one line up and down
 nnoremap <C-j> ddp
 nnoremap <C-k> ddkP
@@ -247,8 +252,6 @@ vnoremap zF :<C-u>call ToggleUnfoldSelection()<CR>
 " Resume
 nnoremap zF :call ToggleUnfoldSelection()<CR>zv
 
-vnoremap \z :call GrayOutOthers()<CR>
-
 " Select current fold
 onoremap az :<C-U>silent! keepjumps normal![zV]z<CR>
 xnoremap az :<C-U>silent! keepjumps normal![zV]z<CR>
@@ -298,6 +301,8 @@ function! GrayOutOthers()
     call setpos('.', pos)
   endif
 endfunction
+vnoremap \z :call GrayOutOthers()<CR>
+nnoremap \z :call GrayOutOthers()<CR>
 
 " }}}
 " REGISTER {{{
@@ -481,7 +486,7 @@ function! CloseBufferSafely()
   endif
 
   let bufnr = bufnr()
-  if !has_key(t:, 'bufs') || len(t:bufs) == 1
+  if !has_key(t:, 'bufs') || len(t:bufs) <= 1
     " Close tab for last buffer
     tabclose
   else
@@ -621,10 +626,10 @@ endfunc
 " }}}
 " TERMINAL {{{
 
-" Use <leader>z to toggle
+" Use <leader>z to toggle window padding for alacritty
 let g:alacritty_extra_padding = 0
-function! ToggleWinPadding()
-  if g:alacritty_extra_padding
+function! ToggleWinPadding(padding)
+  if g:alacritty_extra_padding && !a:padding
     !alacritty msg config --window-id $WINDOWID --reset
     call SetEmulaterBackground()
     hi EndOfBuffer None
@@ -638,12 +643,14 @@ function! ToggleWinPadding()
       exe "hi EndOfBuffer guifg="..bg_color.." guibg="..bg_color
       exe "hi MsgArea guibg="..bg_color
     endtry
-    exe "!alacritty msg config --window-id $WINDOWID window.padding.x=270 'colors.primary.background=\"\\"..bg_color.."\"'"
+
+    let padding = a:padding ? a:padding : "270"
+    exe "!alacritty msg config --window-id $WINDOWID window.padding.x=" . padding . " 'colors.primary.background=\"\\"..bg_color.."\"'"
   endif
 
   let g:alacritty_extra_padding = !g:alacritty_extra_padding
 endfunc
-nnoremap <leader>z <Cmd>silent call ToggleWinPadding()<CR>
+nnoremap <expr> <leader>z ":\<C-u> silent call ToggleWinPadding(" . v:count . ")\<CR>"
 
 " In case ALT key is not working
 " execute "set <M-2>=\e2"
@@ -666,7 +673,7 @@ nnoremap <leader>z <Cmd>silent call ToggleWinPadding()<CR>
 " HIGHLIGHT {{{
 
 nnoremap <leader>I :Inspect<CR>
-nnoremap <expr> \sy exists("g:syntax_on") ? ":syntax off <CR>" : ":syntax enable<CR>"
+nnoremap <expr> \s exists("g:syntax_on") ? ":syntax off <CR>" : ":syntax enable<CR>"
 
 " Toggle conceallevel0/2
 nnoremap <expr> \c ":set conceallevel="..(&cole ? 0 : 2).."<CR>:set cole?<CR>"
diff --git a/vim/mini.lua b/vim/mini.lua
index ff1a3fe..1ca1d26 100644
--- a/vim/mini.lua
+++ b/vim/mini.lua
@@ -48,7 +48,7 @@ require("mini.extra").setup()
 -- }}}
 -- mini.colors {{{
 require("mini.colors").setup()
-vim.keymap.set("n", "<leader><leader>co", function()
+vim.keymap.set("n", "<leader><leader>color", function()
   require("mini.colors").interactive()
 end)
 -- }}}
@@ -323,6 +323,12 @@ require("mini.pairs").setup()
 -- -- suda {{{
 -- add { source = "lambdalisue/suda.vim" }
 -- }}}
+-- -- undotree {{{
+-- Add {
+--   source = 'mbbill/undotree'
+-- }
+-- vim.cmd("nnoremap <F5> :UndotreeToggle<CR>")
+-- -- }}}
 -- marks.nvim {{{
 Add {
   source = "chentoast/marks.nvim"