diff --git a/lua/my_keymappings.lua b/lua/my_keymappings.lua index 28cac05..7554670 100644 --- a/lua/my_keymappings.lua +++ b/lua/my_keymappings.lua @@ -1,60 +1,57 @@ -local utils = require('utils') vim.g.mapleader = ',' -utils.map('n', '', 'nil', { noremap = true, silent = true }) +vim.keymap.set('n', '', 'nil', { noremap = true, silent = true }) -- Paste from clipboard -utils.map('n', 'p', '"+p') -utils.map('n', 'P', '"+P') -utils.map('v', 'p', '"+p') -utils.map('v', 'P', '"+P') +vim.keymap.set('n', 'p', '"+p') +vim.keymap.set('n', 'P', '"+P') +vim.keymap.set('v', 'p', '"+p') +vim.keymap.set('v', 'P', '"+P') -- Yank to clipboard -utils.map('v', 'y', '"+y') -utils.map('n', 'Y', '"+yg_') -utils.map('n', 'y', '"+y') -utils.map('n', 'yy', '"+yy') +vim.keymap.set('v', 'y', '"+y') +vim.keymap.set('n', 'Y', '"+yg_') +vim.keymap.set('n', 'y', '"+y') +vim.keymap.set('n', 'yy', '"+yy') -- Tabs -utils.map('n', '', ':tabnext', { noremap = true, silent = true }) -utils.map('n', '', ':tabprevious', { noremap = true, silent = true }) +vim.keymap.set('n', '', ':tabnext', { noremap = true, silent = true }) +vim.keymap.set('n', '', ':tabprevious', { noremap = true, silent = true }) -- Split movement -utils.map('n', '', ':wincmd k', { noremap = true, silent = true }) -utils.map('n', '', ':wincmd j', { noremap = true, silent = true }) -utils.map('n', '', ':wincmd h', { noremap = true, silent = true }) -utils.map('n', '', ':wincmd l', { noremap = true, silent = true }) +vim.keymap.set('n', '', ':wincmd k', { noremap = true, silent = true }) +vim.keymap.set('n', '', ':wincmd j', { noremap = true, silent = true }) +vim.keymap.set('n', '', ':wincmd h', { noremap = true, silent = true }) +vim.keymap.set('n', '', ':wincmd l', { noremap = true, silent = true }) -utils.map('n', '', ':wa') +vim.keymap.set('n', '', ':wa') -- Linewrap and jumping -utils.map('n', 'k', 'gk') -utils.map('n', 'j', 'gj') -utils.map('n', '0', 'g0') -utils.map('n', '$', 'g$') -utils.map('n', '', 'gk') -utils.map('n', '', 'gj') -utils.map('n', '', 'g') -utils.map('n', '', 'g') -utils.map('v', 'k', 'gk') -utils.map('v', 'j', 'gj') -utils.map('v', '0', 'g0') -utils.map('v', '$', 'g$') -utils.map('v', '', 'gk') -utils.map('v', '', 'gj') -utils.map('v', '', 'g') -utils.map('v', '', 'g') +vim.keymap.set('n', 'k', 'gk') +vim.keymap.set('n', 'j', 'gj') +vim.keymap.set('n', '0', 'g0') +vim.keymap.set('n', '$', 'g$') +vim.keymap.set('n', '', 'gk') +vim.keymap.set('n', '', 'gj') +vim.keymap.set('n', '', 'g') +vim.keymap.set('n', '', 'g') +vim.keymap.set('v', 'k', 'gk') +vim.keymap.set('v', 'j', 'gj') +vim.keymap.set('v', '0', 'g0') +vim.keymap.set('v', '$', 'g$') +vim.keymap.set('v', '', 'gk') +vim.keymap.set('v', '', 'gj') +vim.keymap.set('v', '', 'g') +vim.keymap.set('v', '', 'g') -utils.map('v', '<', '', '>gv') - -utils.map('n', 'a', '"ayiw') +vim.keymap.set('v', '<', '', '>gv') -- Highlight word under cursor -utils.map('n', 'ü', ':let @/=\'\\<=expand("")\\>\':set hls', { noremap = true, silent = true }) -utils.map('v', 'ü', "y:let @/='=escape(@\",'/\\')':set hls") -utils.map('v', 'ü', "y:let @/='=escape(@\",'/\\')':set hls", { noremap = true, silent = true }) +vim.keymap.set('n', 'ü', ':let @/=\'\\<=expand("")\\>\':set hls', { noremap = true, silent = true }) +vim.keymap.set('v', 'ü', "y:let @/='=escape(@\",'/\\')':set hls") +vim.keymap.set('v', 'ü', "y:let @/='=escape(@\",'/\\')':set hls", { noremap = true, silent = true }) -- Close Buffer -utils.map('n', '', ':bd') +vim.keymap.set('n', '', ':bd') -- to navigate the completion menu -utils.map('i', '', 'pumvisible() ? "\\" : "\\"', { expr = true }) -utils.map('i', '', 'pumvisible() ? "\\" : "\\"', { expr = true }) +vim.keymap.set('i', '', 'pumvisible() ? "\\" : "\\"', { expr = true }) +vim.keymap.set('i', '', 'pumvisible() ? "\\" : "\\"', { expr = true }) diff --git a/lua/setup/cmake.lua b/lua/setup/cmake.lua index 663d5fe..0400e6f 100644 --- a/lua/setup/cmake.lua +++ b/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. diff --git a/lua/setup/my_command_center.lua b/lua/setup/my_command_center.lua index eae54e0..d0dff1c 100644 --- a/lua/setup/my_command_center.lua +++ b/lua/setup/my_command_center.lua @@ -160,4 +160,11 @@ command_center.add({ { 'n', 'g', silent_noremap }, }, }, + { + description = 'Word under cursor into register a', + cmd = '"ayiw', + keybindings = { + { 'n', 'a', silent_noremap }, + }, + }, }) diff --git a/lua/setup/neo-tree.lua b/lua/setup/neo-tree.lua index 45322b6..94d38f5 100644 --- a/lua/setup/neo-tree.lua +++ b/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', '\\', 'Neotree reveal') +vim.keymap.set('n', '\\', 'Neotree reveal') diff --git a/lua/setup/neogen.lua b/lua/setup/neogen.lua index 5a10946..4968fec 100644 --- a/lua/setup/neogen.lua +++ b/lua/setup/neogen.lua @@ -18,5 +18,3 @@ require('neogen').setup({ }, }, }) - -local utils = require('utils') diff --git a/lua/setup/nvim-tree.lua b/lua/setup/nvim-tree.lua index 950e594..3295d15 100644 --- a/lua/setup/nvim-tree.lua +++ b/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', 'tt', 'NvimTreeToggle') +vim.keymap.set('n', 'tt', 'NvimTreeToggle') vim.g.nvim_tree_highlight_opened_files = 1 vim.g.nvim_tree_respect_buf_cwd = 1 diff --git a/lua/setup/project.lua b/lua/setup/project.lua index dbde7f7..abbc92a 100644 --- a/lua/setup/project.lua +++ b/lua/setup/project.lua @@ -1,4 +1,3 @@ -local utils = require('utils') require('project_nvim').setup({ silent_chdir = true, ignore_lsp = { 'null-ls' }, diff --git a/lua/utils/init.lua b/lua/utils/init.lua index ab1f91a..9569fc1 100644 --- a/lua/utils/init.lua +++ b/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