Update whichkey (#8)

* Clean

* More cleaning

* Fix whichkey gg

* Update whichkey

* Update fold marker

Author: frazrepo

basic.vim

@@ -520,13 +520,14 @@ function s:Toggle(pattern, dict, ...)
   return view
 endfunction
 
-" }}} "
-
-" Host specific vim 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Host specific vim {{{1 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 if filereadable(expand($HOME . '/.vimrc.local'))
     source $HOME/.vimrc.local
 endif
 
+" }}} "
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Modeline
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""

ftplugin/css.vim

@@ -104,6 +104,8 @@ endif
 
 Plug 'liuchengxu/vim-which-key'
 
+"}}}1
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Plugs End 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""

ftplugin/html.vim

@@ -257,8 +257,14 @@ colorscheme tokyonight
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => whichkey {{{1
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""             
-" Space whihch key
-noremap <silent> <leader> :WhichKey '<Space>'<CR>
+" Options
+let g:which_key_fallback_to_native_key = 1
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Space whichkey {{{2
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""             
+nnoremap <silent> <leader> :<c-u>WhichKey '<Space>'<CR>
+vnoremap <silent> <leader> :<c-u>WhichKeyVisual '<Space>'<CR>
 let g:which_key_map = {}
 " Direct maps
 let g:which_key_map.u = 'Find recent files'
@@ -325,26 +331,46 @@ let g:which_key_map.r = {
       \ 'name' : '+replace',
       \ }
 
+" Code/ Format/ Change
+let g:which_key_map.c = {
+      \ 'name' : '+code/format/change',
+      \ 'd' : 'Change to current buffer directory',
+      \ }
 call which_key#register('<Space>', 'g:which_key_map')
 
-" g which key"
-" Disabled for now as not working when typing gg
-"noremap <silent> g :WhichKey 'g'<CR>
-"let g:g_which_key_map = {}
-"" Direct maps
-"let g:g_which_key_map['%'] = 'Macth pair backward'
-"let g:g_which_key_map['='] = 'Indent buffer'
-"let g:g_which_key_map['Q'] = 'Format buffer'
-"let g:g_which_key_map.l = 'Align right'
-"let g:g_which_key_map.L = 'Align left'
-"let g:g_which_key_map.c = 'Comment'
-"let g:g_which_key_map['cc'] = 'Comment line'
-"let g:g_which_key_map.r = 'Replace operator'
-"let g:g_which_key_map['rr'] = 'Replace line (with register)'
-"let g:g_which_key_map.s = 'Sort operator'
-"let g:g_which_key_map['ss'] = 'Sort lines'
-"let g:g_which_key_map.V = 'Reselect visual selection'
-"call which_key#register('g', 'g:g_which_key_map')
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => g whichkey {{{2
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""             
+nnoremap <silent> g :<c-u>WhichKey 'g'<CR>
+vnoremap <silent> g :<c-u>WhichKeyVisual 'g'<CR>
+let g:g_which_key_map = {}
+" Direct maps
+let g:g_which_key_map['%'] = 'Macth pair backward'
+let g:g_which_key_map['='] = 'Indent buffer'
+let g:g_which_key_map['Q'] = 'Format buffer'
+let g:g_which_key_map.l = 'Align right'
+let g:g_which_key_map.L = 'Align left'
+let g:g_which_key_map.c = 'Comment'
+let g:g_which_key_map['cc'] = 'Comment line'
+let g:g_which_key_map.r = 'Replace operator'
+let g:g_which_key_map['rr'] = 'Replace line (with register)'
+let g:g_which_key_map.s = 'Sort operator'
+let g:g_which_key_map['ss'] = 'Sort lines'
+let g:g_which_key_map.V = 'Reselect visual selection'
+" Group
+let g:g_which_key_map.o = {
+      \ 'name' : '+gtfo',
+      \ }
+" Diff
+let g:g_which_key_map.d = {
+      \ 'name' : '+diffget',
+      \ }
+call which_key#register('g', 'g:g_which_key_map')
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => c whichkey {{{2
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""             
+nnoremap <silent> c :<c-u>WhichKey 'c'<CR>
+vnoremap <silent> c :<c-u>WhichKeyVisual 'c'<CR>
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Modeline
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""