update
This commit is contained in:
parent
5b8bc3b260
commit
f25ee2d0f1
78
init.lua
78
init.lua
|
@ -129,47 +129,6 @@ vim.opt.cursorline = true
|
||||||
vim.opt.scrolloff = 10
|
vim.opt.scrolloff = 10
|
||||||
|
|
||||||
--[[---------------------------------------------------------------------------------------------------]]
|
--[[---------------------------------------------------------------------------------------------------]]
|
||||||
-- __
|
|
||||||
-- / /_____ __ ____ _ ___ ____ ___
|
|
||||||
-- / '_/ -_) // / ' \/ _ `/ _ \(_-<
|
|
||||||
-- /_/\_\\__/\_, /_/_/_/\_,_/ .__/___/
|
|
||||||
-- /___/ /_/
|
|
||||||
|
|
||||||
-- See `:help vim.keymap.set()`
|
|
||||||
|
|
||||||
-- Clear highlights on search when pressing <Esc> in normal mode
|
|
||||||
-- See `:help hlsearch`
|
|
||||||
vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
|
|
||||||
|
|
||||||
-- Diagnostic keymaps
|
|
||||||
vim.keymap.set('n', '<leader>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 <C-\><C-n>, 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 <C-\><C-n> to exit terminal mode
|
|
||||||
vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' })
|
|
||||||
|
|
||||||
-- Disable arrow keys in normal mode
|
|
||||||
vim.keymap.set('n', '<left>', '<cmd>echo "Use h instead"<CR>')
|
|
||||||
vim.keymap.set('n', '<right>', '<cmd>echo "Use l instead"<CR>')
|
|
||||||
vim.keymap.set('n', '<up>', '<cmd>echo "Use k instead"<CR>')
|
|
||||||
vim.keymap.set('n', '<down>', '<cmd>echo "Use j instead"<CR>')
|
|
||||||
|
|
||||||
-- Keybinds to make split navigation easier.
|
|
||||||
-- Use CTRL+<hjkl> to switch between windows
|
|
||||||
--
|
|
||||||
-- See `:help wincmd` for a list of all window commands
|
|
||||||
vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
|
|
||||||
vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
|
|
||||||
vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
|
|
||||||
vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
|
|
||||||
|
|
||||||
-- Key mapping to delete the current line using the black hole register
|
|
||||||
vim.keymap.set('n', '<C-x>', '"_dd:echo "Line deleted"<CR>', { noremap = true, silent = true })
|
|
||||||
vim.keymap.set('i', '<C-x>', '<Esc>"_dd:echo "Line deleted"<CR>i', { noremap = true, silent = true })
|
|
||||||
|
|
||||||
--[[---------------------------------------------------------------------------------------------------]]
|
--[[---------------------------------------------------------------------------------------------------]]
|
||||||
-- __ __
|
-- __ __
|
||||||
|
@ -236,27 +195,26 @@ require('lazy').setup({
|
||||||
-- NOTE: Plugins can also be added by using a table,
|
-- NOTE: Plugins can also be added by using a table,
|
||||||
-- with the first argument being the link and the following
|
-- with the first argument being the link and the following
|
||||||
-- keys can be used to configure plugin behavior/loading/etc.
|
-- 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
|
-- Use `opts = {}` to force a plugin to be loaded.
|
||||||
-- options to `gitsigns.nvim`. This is equivalent to the following Lua:
|
--
|
||||||
-- require('gitsigns').setup({ ... })
|
-- Here is a more advanced example where we pass configuration
|
||||||
--
|
-- options to `gitsigns.nvim`. This is equivalent to the following Lua:
|
||||||
-- See `:help gitsigns` to understand what the configuration keys do
|
-- require('gitsigns').setup({ ... })
|
||||||
{ -- Adds git related signs to the gutter, as well as utilities for managing changes
|
--
|
||||||
'lewis6991/gitsigns.nvim',
|
-- See `:help gitsigns` to understand what the configuration keys do
|
||||||
opts = {
|
{ -- Adds git related signs to the gutter, as well as utilities for managing changes
|
||||||
signs = {
|
'lewis6991/gitsigns.nvim',
|
||||||
add = { text = '+' },
|
opts = {
|
||||||
change = { text = '~' },
|
signs = {
|
||||||
delete = { text = '_' },
|
add = { text = '+' },
|
||||||
topdelete = { text = '‾' },
|
change = { text = '~' },
|
||||||
changedelete = { text = '~' },
|
delete = { text = '_' },
|
||||||
|
topdelete = { text = '‾' },
|
||||||
|
changedelete = { text = '~' },
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
|
||||||
|
|
||||||
-- NOTE: Plugins can also be configured to run Lua code when they are loaded.
|
-- 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`
|
-- The line beneath this is called `modeline`. See `:help modeline`
|
||||||
-- vim: ts=2 sts=2 sw=2 et
|
-- vim: ts=2 sts=2 sw=2 et
|
||||||
|
|
|
@ -0,0 +1,48 @@
|
||||||
|
|
||||||
|
|
||||||
|
return {
|
||||||
|
-- __
|
||||||
|
-- / /_____ __ ____ _ ___ ____ ___
|
||||||
|
-- / '_/ -_) // / ' \/ _ `/ _ \(_-<
|
||||||
|
-- /_/\_\\__/\_, /_/_/_/\_,_/ .__/___/
|
||||||
|
-- /___/ /_/
|
||||||
|
|
||||||
|
-- See `:help vim.keymap.set()`
|
||||||
|
|
||||||
|
-- Clear highlights on search when pressing <Esc> in normal mode
|
||||||
|
-- See `:help hlsearch`
|
||||||
|
vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
|
||||||
|
|
||||||
|
-- Diagnostic keymaps
|
||||||
|
vim.keymap.set('n', '<leader>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 <C-\><C-n>, 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 <C-\><C-n> to exit terminal mode
|
||||||
|
vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' })
|
||||||
|
|
||||||
|
-- Disable arrow keys in normal mode
|
||||||
|
vim.keymap.set('n', '<left>', '<cmd>echo "Use h instead"<CR>')
|
||||||
|
vim.keymap.set('n', '<right>', '<cmd>echo "Use l instead"<CR>')
|
||||||
|
vim.keymap.set('n', '<up>', '<cmd>echo "Use k instead"<CR>')
|
||||||
|
vim.keymap.set('n', '<down>', '<cmd>echo "Use j instead"<CR>')
|
||||||
|
|
||||||
|
-- Keybinds to make split navigation easier.
|
||||||
|
-- Use CTRL+<hjkl> to switch between windows
|
||||||
|
--
|
||||||
|
-- See `:help wincmd` for a list of all window commands
|
||||||
|
vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
|
||||||
|
vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
|
||||||
|
vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
|
||||||
|
vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
|
||||||
|
|
||||||
|
-- Key mapping to delete the current line using the black hole register
|
||||||
|
vim.keymap.set('n', '<C-x>', '"_dd:echo "Line deleted"<CR>', { noremap = true, silent = true })
|
||||||
|
vim.keymap.set('i', '<C-x>', '<Esc>"_dd:echo "Line deleted"<CR>i', { noremap = true, silent = true })
|
||||||
|
end
|
||||||
|
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue