clean mapping syntax

This commit is contained in:
siduck 2024-02-25 08:43:48 +05:30
parent 9414658e35
commit 4b1bca5303
9 changed files with 244 additions and 626 deletions

View file

@ -0,0 +1,26 @@
local options = {
signs = {
add = { text = "" },
change = { text = "" },
delete = { text = "󰍵" },
topdelete = { text = "" },
changedelete = { text = "~" },
untracked = { text = "" },
},
on_attach = function(bufnr)
local gs = package.loaded.gitsigns
local function opts(desc)
return { buffer = bufnr, desc = desc }
end
local map = vim.keymap.set
map("n", "<leader>rh", gs.reset_hunk, opts "Reset Hunk")
map("n", "<leader>ph", gs.preview_hunk, opts "Preview Hunk")
map("n", "<leader>gb", gs.blame_line, opts "Blame Line")
end,
}
return options

View file

@ -1,8 +1,8 @@
local M = {}
local map = vim.keymap.set
-- export on_attach & capabilities for custom lspconfigs
M.on_attach = function(client, bufnr)
local utils = require "core.utils"
local conf = require("nvconfig").ui.lsp
-- semanticTokens
@ -14,7 +14,26 @@ M.on_attach = function(client, bufnr)
require("nvchad.signature").setup(client, bufnr)
end
utils.load_mappings("lspconfig", { buffer = bufnr })
local function opts(desc)
return { buffer = bufnr, desc = desc }
end
map("n", "gD", vim.lsp.buf.declaration, opts "Go to declaration | lsp")
map("n", "gd", vim.lsp.buf.definition, opts "Go to definition | lsp")
map("n", "K", vim.lsp.buf.hover, opts "Show hover information | lsp")
map("n", "gi", vim.lsp.buf.implementation, opts "Go to implementation | lsp")
map("n", "<C-k>", vim.lsp.buf.signature_help, opts "Show signature help | lsp")
map("n", "<leader>wa", vim.lsp.buf.add_workspace_folder, opts "Add workspace folder | lsp")
map("n", "<leader>wr", vim.lsp.buf.remove_workspace_folder, opts "Remove workspace folder | lsp")
map("n", "<leader>wl", function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, opts "List workspace folders | lsp")
map("n", "<leader>D", vim.lsp.buf.type_definition, opts "Go to type definition | lsp")
map("n", "<leader>rn", vim.lsp.buf.rename, opts "Rename symbol | lsp")
map({ "n", "v" }, "<leader>ca", vim.lsp.buf.code_action, opts "Code action | lsp")
map("n", "gr", vim.lsp.buf.references, opts "Show references | lsp")
end
M.capabilities = vim.lsp.protocol.make_client_capabilities()

View file

@ -0,0 +1,23 @@
-- vscode format
require("luasnip.loaders.from_vscode").lazy_load()
require("luasnip.loaders.from_vscode").lazy_load { paths = "your path!" }
require("luasnip.loaders.from_vscode").lazy_load { paths = vim.g.vscode_snippets_path or "" }
-- snipmate format
require("luasnip.loaders.from_snipmate").load()
require("luasnip.loaders.from_snipmate").lazy_load { paths = vim.g.snipmate_snippets_path or "" }
-- lua format
require("luasnip.loaders.from_lua").load()
require("luasnip.loaders.from_lua").lazy_load { paths = vim.g.lua_snippets_path or "" }
vim.api.nvim_create_autocmd("InsertLeave", {
callback = function()
if
require("luasnip").session.current_nodes[vim.api.nvim_get_current_buf()]
and not require("luasnip").session.jump_active
then
require("luasnip").unlink_current()
end
end,
})

View file

@ -1,50 +0,0 @@
local M = {}
local utils = require "core.utils"
M.blankline = {
indent = { char = "", highlight = "IblChar" },
scope = { char = "", highlight = "IblScopeChar" },
}
M.luasnip = function(opts)
require("luasnip").config.set_config(opts)
-- vscode format
require("luasnip.loaders.from_vscode").lazy_load()
require("luasnip.loaders.from_vscode").lazy_load { paths = vim.g.vscode_snippets_path or "" }
-- snipmate format
require("luasnip.loaders.from_snipmate").load()
require("luasnip.loaders.from_snipmate").lazy_load { paths = vim.g.snipmate_snippets_path or "" }
-- lua format
require("luasnip.loaders.from_lua").load()
require("luasnip.loaders.from_lua").lazy_load { paths = vim.g.lua_snippets_path or "" }
vim.api.nvim_create_autocmd("InsertLeave", {
callback = function()
if
require("luasnip").session.current_nodes[vim.api.nvim_get_current_buf()]
and not require("luasnip").session.jump_active
then
require("luasnip").unlink_current()
end
end,
})
end
M.gitsigns = {
signs = {
add = { text = "" },
change = { text = "" },
delete = { text = "󰍵" },
topdelete = { text = "" },
changedelete = { text = "~" },
untracked = { text = "" },
},
on_attach = function(bufnr)
utils.load_mappings("gitsigns", { buffer = bufnr })
end,
}
return M

View file

@ -48,11 +48,11 @@ local default_plugins = {
{
"lukas-reineke/indent-blankline.nvim",
event = "User FilePost",
opts = function()
return require("plugins.configs.others").blankline
end,
opts = {
indent = { char = "", highlight = "IblChar" },
scope = { char = "", highlight = "IblScopeChar" },
},
config = function(_, opts)
require("core.utils").load_mappings "blankline"
dofile(vim.g.base46_cache .. "blankline")
local hooks = require "ibl.hooks"
@ -81,7 +81,7 @@ local default_plugins = {
"lewis6991/gitsigns.nvim",
event = "User FilePost",
opts = function()
return require("plugins.configs.others").gitsigns
return require("plugins.configs.gitsigns")
end,
config = function(_, opts)
dofile(vim.g.base46_cache .. "git")
@ -130,7 +130,8 @@ local default_plugins = {
dependencies = "rafamadriz/friendly-snippets",
opts = { history = true, updateevents = "TextChanged,TextChangedI" },
config = function(_, opts)
require("plugins.configs.others").luasnip(opts)
require("luasnip").config.set_config(opts)
require "plugins.configs.luasnip"
end,
},
@ -178,7 +179,7 @@ local default_plugins = {
{ "gb", mode = "x", desc = "Comment toggle blockwise (visual)" },
},
init = function()
require("core.utils").load_mappings "comment"
vim.g.comment_maps = true
end,
config = function(_, opts)
require("Comment").setup(opts)
@ -189,9 +190,6 @@ local default_plugins = {
{
"nvim-tree/nvim-tree.lua",
cmd = { "NvimTreeToggle", "NvimTreeFocus" },
init = function()
require("core.utils").load_mappings "nvimtree"
end,
opts = function()
return require "plugins.configs.nvimtree"
end,
@ -205,9 +203,6 @@ local default_plugins = {
"nvim-telescope/telescope.nvim",
dependencies = { "nvim-treesitter/nvim-treesitter" },
cmd = "Telescope",
init = function()
require("core.utils").load_mappings "telescope"
end,
opts = function()
return require "plugins.configs.telescope"
end,
@ -227,9 +222,6 @@ local default_plugins = {
{
"folke/which-key.nvim",
keys = { "<leader>", "<c-r>", "<c-w>", '"', "'", "`", "c", "v", "g" },
init = function()
require("core.utils").load_mappings "whichkey"
end,
cmd = "WhichKey",
config = function(_, opts)
dofile(vim.g.base46_cache .. "whichkey")