use 0.7 keymappings

lua/my_keymappings.lua

@@ -1,60 +1,57 @@
-local utils = require('utils')
 vim.g.mapleader = ','
-utils.map('n', '<space>', 'nil', { noremap = true, silent = true })
+vim.keymap.set('n', '<space>', 'nil', { noremap = true, silent = true })
 -- Paste from clipboard
-utils.map('n', '<leader>p', '"+p')
+vim.keymap.set('n', '<leader>p', '"+p')
-utils.map('n', '<leader>P', '"+P')
+vim.keymap.set('n', '<leader>P', '"+P')
-utils.map('v', '<leader>p', '"+p')
+vim.keymap.set('v', '<leader>p', '"+p')
-utils.map('v', '<leader>P', '"+P')
+vim.keymap.set('v', '<leader>P', '"+P')
 
 -- Yank to clipboard
-utils.map('v', '<leader>y', '"+y')
+vim.keymap.set('v', '<leader>y', '"+y')
-utils.map('n', '<leader>Y', '"+yg_')
+vim.keymap.set('n', '<leader>Y', '"+yg_')
-utils.map('n', '<leader>y', '"+y')
+vim.keymap.set('n', '<leader>y', '"+y')
-utils.map('n', '<leader>yy', '"+yy')
+vim.keymap.set('n', '<leader>yy', '"+yy')
 
 -- Tabs
-utils.map('n', '<S-Right>', ':tabnext<CR>', { noremap = true, silent = true })
+vim.keymap.set('n', '<S-Right>', ':tabnext<CR>', { noremap = true, silent = true })
-utils.map('n', '<S-Left>', ':tabprevious<CR>', { noremap = true, silent = true })
+vim.keymap.set('n', '<S-Left>', ':tabprevious<CR>', { noremap = true, silent = true })
 -- Split movement
-utils.map('n', '<A-Up>', ':wincmd k<CR>', { noremap = true, silent = true })
+vim.keymap.set('n', '<A-Up>', ':wincmd k<CR>', { noremap = true, silent = true })
-utils.map('n', '<A-Down>', ':wincmd j<CR>', { noremap = true, silent = true })
+vim.keymap.set('n', '<A-Down>', ':wincmd j<CR>', { noremap = true, silent = true })
-utils.map('n', '<A-Left>', ':wincmd h<CR>', { noremap = true, silent = true })
+vim.keymap.set('n', '<A-Left>', ':wincmd h<CR>', { noremap = true, silent = true })
-utils.map('n', '<A-Right>', ':wincmd l<CR>', { noremap = true, silent = true })
+vim.keymap.set('n', '<A-Right>', ':wincmd l<CR>', { noremap = true, silent = true })
 
-utils.map('n', '<C-S>', ':wa<CR>')
+vim.keymap.set('n', '<C-S>', ':wa<CR>')
 
 -- Linewrap and jumping
-utils.map('n', 'k', 'gk')
+vim.keymap.set('n', 'k', 'gk')
-utils.map('n', 'j', 'gj')
+vim.keymap.set('n', 'j', 'gj')
-utils.map('n', '0', 'g0')
+vim.keymap.set('n', '0', 'g0')
-utils.map('n', '$', 'g$')
+vim.keymap.set('n', '$', 'g$')
-utils.map('n', '<Up>', 'gk')
+vim.keymap.set('n', '<Up>', 'gk')
-utils.map('n', '<Down>', 'gj')
+vim.keymap.set('n', '<Down>', 'gj')
-utils.map('n', '<Home>', 'g<Home>')
+vim.keymap.set('n', '<Home>', 'g<Home>')
-utils.map('n', '<End>', 'g<End>')
+vim.keymap.set('n', '<End>', 'g<End>')
-utils.map('v', 'k', 'gk')
+vim.keymap.set('v', 'k', 'gk')
-utils.map('v', 'j', 'gj')
+vim.keymap.set('v', 'j', 'gj')
-utils.map('v', '0', 'g0')
+vim.keymap.set('v', '0', 'g0')
-utils.map('v', '$', 'g$')
+vim.keymap.set('v', '$', 'g$')
-utils.map('v', '<Up>', 'gk')
+vim.keymap.set('v', '<Up>', 'gk')
-utils.map('v', '<Down>', 'gj')
+vim.keymap.set('v', '<Down>', 'gj')
-utils.map('v', '<Home>', 'g<Home>')
+vim.keymap.set('v', '<Home>', 'g<Home>')
-utils.map('v', '<End>', 'g<End>')
+vim.keymap.set('v', '<End>', 'g<End>')
 
-utils.map('v', '<', '<gv')
+vim.keymap.set('v', '<', '<gv')
-utils.map('v', '>', '>gv')
+vim.keymap.set('v', '>', '>gv')
-
-utils.map('n', '<leader>a', '"ayiw')
 
 -- Highlight word under cursor
-utils.map('n', 'ü', ':let @/=\'\\<<C-R>=expand("<cword>")<CR>\\>\'<CR>:set hls<CR>', { noremap = true, silent = true })
+vim.keymap.set('n', 'ü', ':let @/=\'\\<<C-R>=expand("<cword>")<CR>\\>\'<CR>:set hls<CR>', { noremap = true, silent = true })
-utils.map('v', 'ü', "y:let @/='<C-R>=escape(@\",'/\\')<CR>'<CR>:set hls<CR>")
+vim.keymap.set('v', 'ü', "y:let @/='<C-R>=escape(@\",'/\\')<CR>'<CR>:set hls<CR>")
-utils.map('v', 'ü', "y:let @/='<C-R>=escape(@\",'/\\')<CR>'<CR>:set hls<CR>", { noremap = true, silent = true })
+vim.keymap.set('v', 'ü', "y:let @/='<C-R>=escape(@\",'/\\')<CR>'<CR>:set hls<CR>", { noremap = true, silent = true })
 
 -- Close Buffer
-utils.map('n', '<C-w>', ':bd<CR>')
+vim.keymap.set('n', '<C-w>', ':bd<CR>')
 
 -- <Tab> to navigate the completion menu
-utils.map('i', '<S-Tab>', 'pumvisible() ? "\\<C-p>" : "\\<Tab>"', { expr = true })
+vim.keymap.set('i', '<S-Tab>', 'pumvisible() ? "\\<C-p>" : "\\<Tab>"', { expr = true })
-utils.map('i', '<Tab>', 'pumvisible() ? "\\<C-n>" : "\\<Tab>"', { expr = true })
+vim.keymap.set('i', '<Tab>', 'pumvisible() ? "\\<C-n>" : "\\<Tab>"', { expr = true })

lua/setup/cmake.lua

@@ -1,5 +1,4 @@
 local opt = vim.opt -- to set options
-local utils = require('utils')
 -- require('telescope').load_extension('cmake')
 require('cmake').setup({
   parameters_file = 'neovim.json', -- JSON file to store information about selected target, run arguments and build type.

lua/setup/my_command_center.lua

@@ -160,4 +160,11 @@ command_center.add({
       { 'n', '<Space>g', silent_noremap },
     },
   },
+  {
+    description = 'Word under cursor into register a',
+    cmd = '"ayiw',
+    keybindings = {
+      { 'n', '<leader>a', silent_noremap },
+    },
+  },
 })

lua/setup/neo-tree.lua

@@ -4,8 +4,6 @@ vim.fn.sign_define('DiagnosticSignWarn', { text = ' ', texthl = 'DiagnosticSi
 vim.fn.sign_define('DiagnosticSignInfo', { text = ' ', texthl = 'DiagnosticSignInfo' })
 vim.fn.sign_define('DiagnosticSignHint', { text = '', texthl = 'DiagnosticSignHint' })
 
-local utils = require('utils')
-
 require('neo-tree').setup({
   window = { -- see https://github.com/MunifTanjim/nui.nvim/tree/main/lua/nui/popup for
     -- possible options. These can also be functions that return these options.
@@ -50,4 +48,4 @@ require('neo-tree').setup({
     },
   },
 })
-utils.map('n', '\\', '<cmd>Neotree reveal<cr>')
+vim.keymap.set('n', '\\', '<cmd>Neotree reveal<cr>')

lua/setup/neogen.lua

@@ -18,5 +18,3 @@ require('neogen').setup({
     },
   },
 })
-
-local utils = require('utils')

lua/setup/nvim-tree.lua

@@ -1,4 +1,3 @@
-local utils = require('utils')
 require('nvim-tree').setup({
   auto_close = true,
   update_cwd = true,
@@ -23,6 +22,6 @@ require('nvim-tree').setup({
     },
   },
 })
-utils.map('n', '<leader>tt', '<cmd>NvimTreeToggle<CR>')
+vim.keymap.set('n', '<leader>tt', '<cmd>NvimTreeToggle<CR>')
 vim.g.nvim_tree_highlight_opened_files = 1
 vim.g.nvim_tree_respect_buf_cwd = 1

lua/setup/project.lua

@@ -1,4 +1,3 @@
-local utils = require('utils')
 require('project_nvim').setup({
   silent_chdir = true,
   ignore_lsp = { 'null-ls' },

lua/utils/init.lua

@@ -9,12 +9,4 @@ function utils.opt(scope, key, value)
   end
 end
 
-function utils.map(mode, lhs, rhs, opts)
-  local options = { noremap = true }
-  if opts then
-    options = vim.tbl_extend('force', options, opts)
-  end
-  vim.api.nvim_set_keymap(mode, lhs, rhs, options)
-end
-
 return utils