update key mappings

This commit is contained in:
xfy
2024-09-10 10:19:10 +08:00
parent 1cb0046beb
commit 52db0f9fcd
4 changed files with 48 additions and 36 deletions

View File

@ -1,14 +1,22 @@
vim.g.mapleader = " "
local keymap = vim.keymap -- for conciseness
local map = vim.keymap.set
keymap.set("n", "<ESC>", ":nohl<CR>", { desc = "Clear search highlights" })
map("n", "<ESC>", ":nohl<CR>", { desc = "Clear search highlights" })
-- increment/decrement numbers
keymap.set("n", "<leader>+", "<C-a>", { desc = "Increment number" }) -- increment
keymap.set("n", "<leader>-", "<C-x>", { desc = "Decrement number" }) -- decrement
map("n", "<leader>+", "<C-a>", { desc = "Increment number" }) -- increment
map("n", "<leader>-", "<C-x>", { desc = "Decrement number" }) -- decrement
-- window management
keymap.set("n", "<leader>|", "<C-w>v", { desc = "Split window vertically" }) -- split window vertically
keymap.set("n", "<leader>_", "<C-w>s", { desc = "Split window horizontally" }) -- split window horizontally
keymap.set("n", "<leader>se", "<C-w>=", { desc = "Make splits equal size" }) -- make split windows equal width & height
map("n", "<leader>|", "<C-w>v", { desc = "Split window vertically" }) -- split window vertically
map("n", "<leader>_", "<C-w>s", { desc = "Split window horizontally" }) -- split window horizontally
map("n", "<leader>se", "<C-w>=", { desc = "Make splits equal size" }) -- make split windows equal width & height
-- move lines
map("n", "<A-j>", ":m .+1<CR>==")
map("n", "<A-k>", ":m .-2<CR>==")
map("i", "<A-j>", "<Esc>:m .+1<CR>==gi")
map("i", "<A-k>", "<Esc>:m .-2<CR>==gi")
map("v", "<A-j>", ":m '>+1<CR>gv=gv")
map("v", "<A-k>", ":m '<-2<CR>gv=gv")

View File

@ -8,6 +8,10 @@ return {
diagnostics = "nvim_lsp",
show_buffer_close_icons = false,
themable = true,
indicator = {
icon = "",
style = "none",
},
offsets = {
{
filetype = "NvimTree",
@ -22,7 +26,11 @@ return {
require("bufferline").setup(opts)
local map = vim.keymap.set
map("n", "<leader>la", ":BufferLineCloseOthers<CR>")
map("n", "<leader>x", ":bp|bd# <CR>")
map("n", "<S-l>", ":BufferLineCycleNext<CR>")
map("n", "<S-h>", ":BufferLineCyclePrev<CR>")
map("n", "<A-l>", ":BufferLineMoveNext<CR>")
map("n", "<A-h>", ":BufferLineMovePrev<CR>")
end,
}

View File

@ -5,12 +5,8 @@ return {
"WhoIsSethDaniel/mason-tool-installer.nvim",
},
config = function()
-- import mason
local mason = require("mason")
-- import mason-lspconfig
local mason_lspconfig = require("mason-lspconfig")
local mason_tool_installer = require("mason-tool-installer")
-- enable mason and configure icons
@ -27,23 +23,23 @@ return {
mason_lspconfig.setup({
-- list of servers for mason to install
ensure_installed = {
"gopls",
"lua_ls",
"rust_analyzer",
"html",
"volar",
"vtsls",
"tailwindcss",
"eslint",
"cssls",
"cssmodules_ls",
"jsonls",
"yamlls",
"docker_compose_language_service",
"dockerls",
"bashls",
"clangd",
"lemminx",
"gopls",
"lua_ls",
"rust_analyzer",
"html",
"volar",
"vtsls",
"tailwindcss",
"eslint",
"cssls",
"cssmodules_ls",
"jsonls",
"yamlls",
"docker_compose_language_service",
"dockerls",
"bashls",
"clangd",
"lemminx",
},
})
@ -55,13 +51,13 @@ return {
"black", -- python formatter
"pylint",
"eslint_d",
"stylua",
"shellharden",
"shfmt",
"goimports",
"goimports-reviser",
"golines",
"taplo",
"stylua",
"shellharden",
"shfmt",
"goimports",
"goimports-reviser",
"golines",
"taplo",
},
})
end,

View File

@ -3,7 +3,7 @@ return {
dependencies = { "nvim-tree/nvim-web-devicons" },
config = function()
local lualine = require("lualine")
local lazy_status = require("lazy.status") -- to configure lazy pending updates count
-- local lazy_status = require("lazy.status") -- to configure lazy pending updates count
-- configure lualine with modified theme
lualine.setup({