1 files changed, 39 insertions, 9 deletions

diff --git a/.vim/init.lua b/.vim/init.lua
index 73a9a4b..c6c1d4f 100644
--- a/.vim/init.lua
+++ b/.vim/init.lua
@@ -145,6 +145,10 @@ vim.keymap.set('n', '<leader>D', function()
     end
     _G.diagnostic_hidden = not _G.diagnostic_hidden
   end)
+wk_register {
+  ['<localleader>d'] = {'show diagnositics'},
+  ['<leader>D'] = {'toggle diagnositics'},
+}
 -- }}}
 
 -- KEY BINDS -- {{{
@@ -177,22 +181,48 @@ vim.keymap.set('n',  'gd', function() misc.open_under_cursor(nil, true) end)
 -- vim.keymap.set('n',  'gf', function() misc.file_under_cursor(function(s) vim.cmd('edit ' .. s) end) end)
 vim.keymap.set('n',  'gx', function() misc.open_under_cursor('url-launcher') end)
 vim.keymap.set('n',  'gu', function() misc.open_under_cursor('url-launcher') end)
-vim.keymap.set('n', 'gGw', function() misc.word_under_cursor(function(s) require('telescope.builtin.files').grep_string({ search = s }) end) end)
-vim.keymap.set('n', 'gGe', function() misc.expr_under_cursor(function(s) require('telescope.builtin.files').grep_string({ search = s }) end) end)
-vim.keymap.set('n', 'gGf', function() misc.file_under_cursor(function(s) require('telescope.builtin.files').grep_string({ search = s }) end) end)
-vim.keymap.set('n',  'gss', function() misc.word_under_cursor(function(s) vim.fn.feedkeys(':%s/' .. s .. '//g'); cmd [[ call feedkeys("\<left>\<left>") ]] end) end)
+
+vim.keymap.set('n', '<localleader>gw', function() misc.word_under_cursor(function(s) require('telescope.builtin.files').grep_string({ search = s }) end) end)
+vim.keymap.set('n', '<localleader>ge', function() misc.expr_under_cursor(function(s) require('telescope.builtin.files').grep_string({ search = s }) end) end)
+vim.keymap.set('n', '<localleader>gf', function() misc.file_under_cursor(function(s) require('telescope.builtin.files').grep_string({ search = s }) end) end)
+vim.keymap.set('n',  '<localleader>gs', function() misc.word_under_cursor(function(s) vim.fn.feedkeys(':%s/' .. s .. '//g'); cmd [[ call feedkeys("\<left>\<left>") ]] end) end)
+wk_register {
+  ['<localleader>g'] = {
+    name = '+Grep',
+    w = {'word_under_cursor'},
+    e = {'expr_under_cursor'},
+    f = {'file_under_cursor'},
+    s = {'substitute'},
+  }
+}
 
 vim.keymap.set('n', '<leader>r', misc.live_grep)
 vim.keymap.set('n', '<leader>f', misc.find_files)
+wk_register {
+  ['<leader>r'] = {'rg'},
+  ['<leader>f'] = {'fd'},
+}
 
-vim.keymap.set('n', 'dgl', 'diffget LOCAL')
-vim.keymap.set('n', 'dgr', 'diffget REMOTE')
-vim.keymap.set('n', 'dpl', 'diffpush LOCAL')
-vim.keymap.set('n', 'dpr', 'diffpush REMOTE')
+vim.keymap.set('n', '<localleader>dgl', 'diffget LOCAL')
+vim.keymap.set('n', '<localleader>dgr', 'diffget REMOTE')
+vim.keymap.set('n', '<localleader>dpl', 'diffpush LOCAL')
+vim.keymap.set('n', '<localleader>dpr', 'diffpush REMOTE')
+wk_register {
+  ['<localleader>d'] = {
+    name = '+Diff',
+    gl = {'get local'},
+    gr = {'get remote'},
+    pl = {'push local'},
+    pr = {'push remote'},
+  }
+}
 
-vim.keymap.set('x', '<leader>bf',
+vim.keymap.set('x', '<localleader>f',
   [[<ESC><CMD>lua require("misc").fold_block()<CR>]],
   { noremap = true, silent = true })
+wk_register { ['<localleader>f'] = {'fold block'} }
+
+-- vim.keymap.set('v', '<c-r>', [[y:%s/<c-r>h//gc<left><left><left>]], { noremap = true, silent = true })
 -- }}}
 
 -- AUTO GROUPS -- {{{