diff --git a/init.lua b/init.lua index 0600bc78..7240cc53 100644 --- a/init.lua +++ b/init.lua @@ -129,47 +129,6 @@ vim.opt.cursorline = true vim.opt.scrolloff = 10 --[[---------------------------------------------------------------------------------------------------]] --- __ --- / /_____ __ ____ _ ___ ____ ___ --- / '_/ -_) // / ' \/ _ `/ _ \(_-< --- /_/\_\\__/\_, /_/_/_/\_,_/ .__/___/ --- /___/ /_/ - --- See `:help vim.keymap.set()` - --- Clear highlights on search when pressing in normal mode --- See `:help hlsearch` -vim.keymap.set('n', '', 'nohlsearch') - --- Diagnostic keymaps -vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) - --- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier --- for people to discover. Otherwise, you normally need to press , which --- is not what someone will guess without a bit more experience. - --- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping --- or just use to exit terminal mode -vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) - --- Disable arrow keys in normal mode -vim.keymap.set('n', '', 'echo "Use h instead"') -vim.keymap.set('n', '', 'echo "Use l instead"') -vim.keymap.set('n', '', 'echo "Use k instead"') -vim.keymap.set('n', '', 'echo "Use j instead"') - --- Keybinds to make split navigation easier. --- Use CTRL+ to switch between windows --- --- See `:help wincmd` for a list of all window commands -vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) - --- Key mapping to delete the current line using the black hole register -vim.keymap.set('n', '', '"_dd:echo "Line deleted"', { noremap = true, silent = true }) -vim.keymap.set('i', '', '"_dd:echo "Line deleted"i', { noremap = true, silent = true }) --[[---------------------------------------------------------------------------------------------------]] -- __ __ @@ -236,27 +195,26 @@ require('lazy').setup({ -- NOTE: Plugins can also be added by using a table, -- with the first argument being the link and the following -- keys can be used to configure plugin behavior/loading/etc. - -- - -- Use `opts = {}` to force a plugin to be loaded. - -- - -- Here is a more advanced example where we pass configuration - -- options to `gitsigns.nvim`. This is equivalent to the following Lua: - -- require('gitsigns').setup({ ... }) - -- - -- See `:help gitsigns` to understand what the configuration keys do - { -- Adds git related signs to the gutter, as well as utilities for managing changes - 'lewis6991/gitsigns.nvim', - opts = { - signs = { - add = { text = '+' }, - change = { text = '~' }, - delete = { text = '_' }, - topdelete = { text = '‾' }, - changedelete = { text = '~' }, + -- Use `opts = {}` to force a plugin to be loaded. + -- + -- Here is a more advanced example where we pass configuration + -- options to `gitsigns.nvim`. This is equivalent to the following Lua: + -- require('gitsigns').setup({ ... }) + -- + -- See `:help gitsigns` to understand what the configuration keys do + { -- Adds git related signs to the gutter, as well as utilities for managing changes + 'lewis6991/gitsigns.nvim', + opts = { + signs = { + add = { text = '+' }, + change = { text = '~' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + }, }, }, - }, -- NOTE: Plugins can also be configured to run Lua code when they are loaded. -- @@ -953,6 +911,6 @@ require('lazy').setup({ }, }, }) - + require('keymap') -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et diff --git a/lua/keymap.lua b/lua/keymap.lua new file mode 100644 index 00000000..6231760c --- /dev/null +++ b/lua/keymap.lua @@ -0,0 +1,48 @@ + + +return { +-- __ +-- / /_____ __ ____ _ ___ ____ ___ +-- / '_/ -_) // / ' \/ _ `/ _ \(_-< +-- /_/\_\\__/\_, /_/_/_/\_,_/ .__/___/ +-- /___/ /_/ + +-- See `:help vim.keymap.set()` + +-- Clear highlights on search when pressing in normal mode +-- See `:help hlsearch` +vim.keymap.set('n', '', 'nohlsearch') + +-- Diagnostic keymaps +vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) + +-- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier +-- for people to discover. Otherwise, you normally need to press , which +-- is not what someone will guess without a bit more experience. + +-- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping +-- or just use to exit terminal mode +vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) + +-- Disable arrow keys in normal mode +vim.keymap.set('n', '', 'echo "Use h instead"') +vim.keymap.set('n', '', 'echo "Use l instead"') +vim.keymap.set('n', '', 'echo "Use k instead"') +vim.keymap.set('n', '', 'echo "Use j instead"') + +-- Keybinds to make split navigation easier. +-- Use CTRL+ to switch between windows +-- +-- See `:help wincmd` for a list of all window commands +vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) + +-- Key mapping to delete the current line using the black hole register +vim.keymap.set('n', '', '"_dd:echo "Line deleted"', { noremap = true, silent = true }) +vim.keymap.set('i', '', '"_dd:echo "Line deleted"i', { noremap = true, silent = true }) +end + +} +