Remove separate keybindings module

tasks/neovim.yml

@@ -116,10 +116,6 @@
         src: 'templates/nvim/lua/auto-commands.lua.j2',
         dest: '{{ xdg_config_dir }}/nvim/lua/auto-commands.lua',
       }
-    - {
-        src: 'templates/nvim/lua/keybindings.lua.j2',
-        dest: '{{ xdg_config_dir }}/nvim/lua/keybindings.lua',
-      }
     - {
         src: 'templates/nvim/lua/lsp.lua.j2',
         dest: '{{ xdg_config_dir }}/nvim/lua/lsp.lua',

templates/nvim/init.lua.j2

@@ -3,7 +3,6 @@
 require('options')
 require('lsp')
 require('nvim-cmp')
-require('keybindings')
 require('auto-commands')
 require('tree-sitter')
 require('lua-line')

templates/nvim/lua/keybindings.lua.j2

@@ -1,12 +0,0 @@
--- {{ ansible_managed }}
-
-local opts = { noremap = true, silent = true }
-
-vim.api.nvim_set_keymap('n', 'ff', '<cmd>lua require("telescope.builtin").find_files()<CR>', opts)
-vim.api.nvim_set_keymap('n', 'fg', '<cmd>lua require("telescope.builtin").live_grep()<CR>', opts)
-vim.api.nvim_set_keymap('n', 'fb', '<cmd>lua require("telescope.builtin").buffers()<CR>', opts)
-vim.api.nvim_set_keymap('n', 'fh', '<cmd>lua require("telescope.builtin").help_tags()<CR>', opts)
-vim.api.nvim_set_keymap('n', 'fj', '<cmd>lua require("telescope.builtin").jumplist()<CR>', opts)
-vim.api.nvim_set_keymap('n', 'fl', '<cmd>lua require("telescope.builtin").loclist()<CR>', opts)
-vim.api.nvim_set_keymap('n', 'fq', '<cmd>lua require("telescope.builtin").quickfix()<CR>', opts)
-vim.api.nvim_set_keymap('n', 'fm', '<cmd>lua require("telescope.builtin").marks()<CR>', opts)

templates/nvim/lua/telescope.lua.j2

@@ -1,6 +1,18 @@
 -- {{ ansible_managed }}
 
-local telescope = require('telescope');
+local telescope = require('telescope')
+local builtin = require('telescope.builtin')
+
+local opts = { noremap = true, silent = true }
+
+vim.api.nvim_set_keymap('n', 'ff', '', { callback = builtin.find_files, unpack(opts) })
+vim.api.nvim_set_keymap('n', 'fg', '', { callback = builtin.live_grep, unpack(opts) })
+vim.api.nvim_set_keymap('n', 'fb', '', { callback = builtin.buffers, unpack(opts) })
+vim.api.nvim_set_keymap('n', 'fh', '', { callback = builtin.help_tags, unpack(opts) })
+vim.api.nvim_set_keymap('n', 'fj', '', { callback = builtin.jumplist, unpack(opts) })
+vim.api.nvim_set_keymap('n', 'fl', '', { callback = builtin.loclist, unpack(opts) })
+vim.api.nvim_set_keymap('n', 'fq', '', { callback = builtin.quickfix, unpack(opts) })
+vim.api.nvim_set_keymap('n', 'fm', '', { callback = builtin.marks, unpack(opts) })
 
 telescope.setup({
   defaults = {