3 files changed, 38 insertions, 17 deletions

diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index 751b3ac..8999f77 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -32,7 +32,6 @@ augroup tabinfo
     endfor
   endfunc
 
-  nnoremap T :echo t:bufs<CR>
 augroup END
 "}}}
 " GERERNAL {{{
@@ -60,9 +59,6 @@ autocmd FocusGained,BufEnter .* checktime
 set spell
 set spellfile="/tmp/spell"
 
-" Custom sign from help page :h sign
-sign define piet text=>> texthl=Search
-
 " }}}
 " VISUAL {{{
 
@@ -96,6 +92,12 @@ set errorformat+=[%f:%l]\ ->\ %m,[%f:%l]:%m
 " Direction for new window
 set splitright
 
+" Set signcolumn
+set signcolumn=auto:3
+" Custom sign from help page :h sign
+sign define piet text=>> texthl=Search
+
+
 " }}}
 " EDIT {{{
 
diff --git a/vim/init/config.vim b/vim/init/config.vim
index 9700c61..368be25 100644
--- a/vim/init/config.vim
+++ b/vim/init/config.vim
@@ -17,7 +17,7 @@ augroup END
 augroup TerminalSize
   au!
   function! LayoutForSmallTerminal(bound)
-    let l:bound = a:bound ? a:bound : 19
+    let l:bound = a:bound ? a:bound : 20
     if &lines < l:bound || g:alacritty_extra_padding
       silent! set cmdheight=0 laststatus=0 showtabline=0 signcolumn=no nowrap scrolloff=1
     else
@@ -124,7 +124,7 @@ augroup InitFileTypes
   " Filetype for Vim {{{
 
   " Help page
-  autocmd BufEnter * if &filetype == 'help' | wincmd T | set buflisted | endif
+  autocmd BufEnter * if &filetype == 'help' | wincmd T | set buflisted nofoldenable | endif
 
   " quickfix: hide line number
   autocmd FileType quickfix setlocal nonumber
@@ -177,8 +177,8 @@ augroup InitFileTypes
       let origin = split(MarkdownFoldText()[2:], ' ')
       let heading = substitute(join(origin[:-3], ' '), '\#', '    ', 'g')
       let lines = join(origin[-2:], ' ')[1:-2]
-      let spaces = repeat('.', 50 - len(heading) - len(lines))
-      return heading..spaces.."  "..lines
+      let fills = repeat('.', 48 - len(heading) - len(lines))
+      return heading.."  "..fills.."  "..lines
     endfunc
 
   augroup END
@@ -224,7 +224,7 @@ augroup InitFileTypes
   " TODO a better way to determine a file is related to password-store, now use
   " files under /dev/shm as filter
   autocmd BufRead /dev/shm/*.txt call SetPasswordFile()
-  function SetPasswordFile()
+  function! SetPasswordFile()
     setlocal foldminlines=0
     setlocal foldmethod=manual
     setlocal foldtext="Password"
@@ -234,7 +234,7 @@ augroup InitFileTypes
   " Beancount {{{
 
   autocmd BufRead,BufNewFile *.bean call PrepareBean()
-  function PrepareBean()
+  function! PrepareBean()
     set filetype=beancount
     silent !setsid fava ~/bean/main.bean &>/dev/null
     autocmd VimLeave * silent !killall fava
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index ce5d315..7921693 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -12,7 +12,7 @@ map <space> /
 inoremap <C-c> <Esc>l
 
 " Set wrap
-nnoremap <leader>W :set wrap!<CR>
+nnoremap \w :set wrap!<CR>
 
 " Fast saving
 function! s:WriteOrEnterFileName()
@@ -53,14 +53,14 @@ function! ToggleWinPadding()
   if g:alacritty_extra_padding
     !alacritty msg config --window-id $WINDOWID --reset
   else
-    redir => output | hi Normal | redir END
+    redir => output | hi SignColumn | redir END
     let bg_color = matchstr(output, 'guibg=\zs[^\s]\+\ze')
     exe "!alacritty msg config --window-id $WINDOWID window.padding.x=300 '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 <leader>z <Cmd>silent call ToggleWinPadding()<CR>
 
 " }}}
 " WORKING_DIR {{{
@@ -180,9 +180,22 @@ nnoremap <C-p> "0p
 map <leader>pp :setlocal paste!<CR>
 
 " Copy from system clipboard
-nnoremap <leader>P :r !xsel -ob<CR>
+nnoremap gp "+p
 vnoremap Y "+y
+
 " }}}
+" MARKS {{{
+
+" Delete mark
+function! DeleteMark(mark)
+  let mark = nr2char(a:mark)
+  if mark =~ '[a-z]'
+    execute "delmarks " . mark
+  endif
+endfunction
+nnoremap dm :call DeleteMark(getchar())<CR>
+
+"}}}
 " EDIT {{{
 
 " Move one line up and down
@@ -194,6 +207,7 @@ nnoremap S S<ESC>
 
 " }}}
 " TERMINAL {{{
+
 " In case ALT key is not working
 " execute "set <M-2>=\e2"
 " execute "set <M-1>=\e1"
@@ -210,6 +224,7 @@ nnoremap S S<ESC>
 " execute "set <M-d>=\ed"
 " execute "set <M-l>=\el"
 " execute "set <M-h>=\eh"
+
 "}}}
 " MANAGE_VIMRC {{{
 
@@ -424,11 +439,11 @@ endfunc
 nnoremap <leader><leader>fm :<C-\>e'set foldmethod='..&foldmethod<CR>
 nnoremap <leader><leader>fc :<C-\>e'set foldcolumn='..&foldcolumn<CR>
 
-nnoremap zi zizz:silent exe &foldenable ? "set foldcolumn=auto:3" : "set foldcolumn=0"<CR>
+nnoremap <expr> zi "zizz:silent set foldcolumn="..(&foldenable ? "0" : "auto:3").."\<CR>"
 
 " Show fold level when it changes
-nnoremap zm zm:set foldlevel<CR>
-nnoremap zr zr:set foldlevel<CR>
+nnoremap zm zm:set foldlevel?<CR>
+nnoremap zr zr:set foldlevel?<CR>
 
 " Fold all except selection
 vnoremap zF :<C-u>call ToggleUnfoldSelection()<CR>
@@ -591,6 +606,10 @@ nnoremap <leader>rr :Redir<space>
 " Search for selected test
 vnoremap * y/\V<C-R>=escape(@",'/\')<CR><CR>
 
+nnoremap g/ gv<esc>/\%V
+vnoremap g/ <esc>/\%V
+
+" Substitue across file
 vnoremap <leader>s y:%s//<C-R>0/g<LEFT><LEFT>
 
 " Usage: Press <TAB> n times for area, and <CR> for substitute