vim: move mappings into plugin callback

2 files changed, 10 insertions, 4 deletions

diff --git a/.vim/init.lua b/.vim/init.lua
index 9ee490d..a527204 100644
--- a/.vim/init.lua
+++ b/.vim/init.lua
@@ -177,10 +177,6 @@ vim.keymap.set('n',  'gd', function() misc.open_under_cursor(nil, true) end, {de
 -- 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, {desc='url-launcher'})
 vim.keymap.set('n',  'gu', function() misc.open_under_cursor('url-launcher') end, {desc='url-launcher'})
-
-vim.keymap.set('n', 'gw', function() misc.word_under_cursor(function(s) require('telescope.builtin').grep_string({ search = s }) end) end, {desc='grep for word under cursor'})
--- vim.keymap.set('n', '<localleader>ge', function() misc.expr_under_cursor(function(s) require('telescope.builtin').grep_string({ search = s }) end) end)
--- vim.keymap.set('n', '<localleader>gf', function() misc.file_under_cursor(function(s) require('telescope.builtin').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)
 
 vim.keymap.set('n', '<leader>r', misc.live_grep, {desc='live grep (rg)'})
diff --git a/.vim/lua/plugins.lua b/.vim/lua/plugins.lua
index 8d8baa9..287d08f 100644
--- a/.vim/lua/plugins.lua
+++ b/.vim/lua/plugins.lua
@@ -772,6 +772,16 @@ require('packer').startup({function()
             cwd = vim.fn.stdpath('config'),
           })
         end, {desc='vim config'})
+
+      vim.keymap.set('n', 'gw', function()
+	misc.word_under_cursor(function(s) require('telescope.builtin').grep_string({ search = s }) end)
+      end, {desc='grep for word under cursor'})
+      -- vim.keymap.set('n', '<localleader>ge', function()
+        -- misc.expr_under_cursor(function(s) require('telescope.builtin').grep_string({ search = s }) end)
+      -- end)
+      -- vim.keymap.set('n', '<localleader>gf', function()
+        -- misc.file_under_cursor(function(s) require('telescope.builtin').grep_string({ search = s }) end)
+      -- end)
     end} -- }}}
 
   use {'tpope/vim-surround'}