sankalp/keycodex
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

♻️ refactor(config): streamline plugins and LSP configurations for improved maintainability

Browse Source
This commit is contained in:
sankalp committed 2025-07-25 13:24:40 +05:45
1 parent 14627f757a
commit f7b8d3c6e9
21 files changed
+171 -1281
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lua/plugins/ai/avante.lua
+2 -19
View File
@@ -158,26 +158,9 @@ avante.setup({
debounce = 600,
throttle = 600,
},
system_prompt = function()
local hub = require('mcphub').get_hub_instance()
return hub:get_active_servers_prompt()
end,
custom_tools = function()
return {
require('mcphub.extensions.avante').mcp_tool(),
}
end,
disabled_tools = {
'list_files',
'search_files',
'read_file',
'create_file',
'rename_file',
'delete_file',
'create_dir',
'rename_dir',
'delete_dir',
'bash',
'replace_in_file',
'web_search',
},
slash_commands = {},
})
lua/plugins/ai/mcphub.lua
-41
View File
@@ -1,41 +0,0 @@
local mcphub = require('mcphub')
mcphub.setup({
port = 37373,
config = vim.fn.expand('~/.config/mcphub/servers.json'),
native_servers = {},
auto_approve = false,
auto_toggle_mcp_servers = true,
extensions = {
avante = {
enabled = true,
make_slash_commands = true,
},
},
ui = {
window = {
width = 0.8,
height = 0.8,
relative = 'editor',
zindex = 50,
border = 'rounded',
},
wo = {},
},
on_ready = function(hub) end,
on_error = function(err) end,
use_bundled_binary = true,
-- server_url = nil, -- defaults to `http://localhost:port`
shutdown_delay = 600000, -- 10 minutes
log = {
level = vim.log.levels.INFO,
to_file = true,
file_path = vim.fn.stdpath('state') .. '/mcphub.log',
prefix = 'MCPHub',
},
})
lua/plugins/editor/surround.lua
+9 -9
View File
@@ -3,13 +3,13 @@ local surround = require('mini.surround')
surround.setup({
custom_surroundings = nil,
mappings = {
add = 'gsa',
delete = 'gsd',
find = 'gsf',
find_left = 'gsF',
highlight = 'gsh',
replace = 'gsr',
update_n_lines = 'gsn',
add = 'sa',
delete = 'sd',
find = 'sf',
find_left = 'sF',
highlight = 'sh',
replace = 'sr',
update_n_lines = 'sn',
suffix_last = 'l', -- Suffix to search with "prev" method
suffix_next = 'n', -- Suffix to search with "next" method
@@ -17,8 +17,8 @@ surround.setup({
-- How to search for surrounding
-- 'cover', 'cover_or_next', 'cover_or_prev','cover_or_nearest', 'next', 'previous', 'nearest'.
search_method = 'cover_or_nearest',
highlight_duration = 500,
search_method = 'cover',
highlight_duration = 300,
n_lines = 20,
respect_selection_type = false,
silent = false,
lua/plugins/editor/treesitter.lua
+1 -2
View File
@@ -18,8 +18,7 @@ treesitter.setup({
indent = { enable = true },
autotag = {
enable = true,
},
},
highlight = {
enable = true,
lua/plugins/lang/conform.lua
+36
View File
@@ -0,0 +1,36 @@
local conform = require('conform')
-- Setup formatters
conform.setup({
formatters_by_ft = {
lua = { 'stylua' },
javascript = { 'prettier' },
typescript = { 'prettier' },
javascriptreact = { 'prettier' },
typescriptreact = { 'prettier' },
markdown = { 'prettier' },
css = { 'prettier' },
scss = { 'prettier' },
html = { 'prettier' },
json = { 'prettier' },
yaml = { 'prettier' },
sh = { 'shfmt' },
elixir = { 'mix' },
-- ruby = { "rubocop" }, -- optional
},
-- Autoformat on save
format_on_save = {
timeout_ms = 1000,
lsp_fallback = true,
},
})
-- Setup mason-conform
local auto_install = require('lib.util').get_user_config('auto_install', true)
local installed_formatters = require('plugins.list').null_ls_sources or {}
require('mason-conform').setup({
ensure_installed = installed_formatters,
automatic_installation = auto_install,
})
lua/plugins/lang/lspconfig.lua
+34 -21
View File
@@ -8,30 +8,27 @@ if auto_install then
end
local capabilities = require('blink.cmp').get_lsp_capabilities()
-- Function to load LSP config from separate files
local function load_lsp_config(server_name)
local config_path = 'lsp.' .. server_name
local ok, config = pcall(require, config_path)
if ok then
return config
end
return nil
end
local default_setup = function(server)
if server == 'tailwindcss' then
lspconfig[server].setup({
-- Check if there's a separate config file for this server
local custom_config = load_lsp_config(server)
if custom_config then
-- Use the custom configuration and add capabilities
local config = vim.tbl_deep_extend('force', custom_config, {
capabilities = capabilities,
filetypes = {
'html',
'css',
'scss',
'javascript',
'javascriptreact',
'typescript',
'typescriptreact',
'vue',
'svelte',
},
init_options = {
userLanguages = {
['javascript'] = 'javascript',
['javascriptreact'] = 'javascript',
['typescript'] = 'typescript',
['typescriptreact'] = 'typescript',
},
},
})
lspconfig[server].setup(config)
else
lspconfig[server].setup({
capabilities = capabilities,
@@ -44,6 +41,22 @@ require('mason-lspconfig').setup({
handlers = { default_setup },
})
-- Setup servers that don't come from Mason
-- Dart language server (comes with Dart SDK)
if vim.fn.executable('dart') == 1 then
local dart_config = load_lsp_config('dartls')
if dart_config then
local config = vim.tbl_deep_extend('force', dart_config, {
capabilities = capabilities,
})
lspconfig.dartls.setup(config)
else
lspconfig.dartls.setup({
capabilities = capabilities,
})
end
end
local signs = { Error = icons.Error, Warn = icons.Warning, Hint = icons.Hint, Info = icons.Information }
vim.diagnostic.config({
underline = true,
lua/plugins/list.lua
+37 -128
View File
@@ -47,11 +47,6 @@ local plugins = {
cmd = 'Gitsigns',
event = { 'BufReadPost', 'BufNewFile' },
},
{
'2kabhishek/markit.nvim',
config = load_config('ui.markit'),
event = { 'BufReadPost', 'BufNewFile' },
},
-- Editor
{
@@ -91,6 +86,14 @@ local plugins = {
config = load_config('editor.ai'),
event = { 'BufReadPost', 'BufNewFile' },
},
{
'Wansmer/treesj',
keys = { '<space>m', '<space>j', '<space>s' },
dependencies = { 'nvim-treesitter/nvim-treesitter' }, -- if you install parsers with `nvim-treesitter`
config = function()
require('treesj').setup()
end,
},
{
'chrisgrieser/nvim-spider',
config = load_config('editor.spider'),
@@ -117,20 +120,38 @@ local plugins = {
config = load_config('lang.mason'),
cmd = 'Mason',
},
-- {
-- 'nvimtools/none-ls.nvim',
-- dependencies = { 'jay-babu/mason-null-ls.nvim' },
-- config = load_config('lang.null-ls'),
-- event = { 'BufReadPost', 'BufNewFile' },
-- },
{
'nvimtools/none-ls.nvim',
dependencies = { 'jay-babu/mason-null-ls.nvim' },
config = load_config('lang.null-ls'),
event = { 'BufReadPost', 'BufNewFile' },
'stevearc/conform.nvim',
dependencies = { 'zapling/mason-conform.nvim' },
config = load_config('lang.conform'),
event = { 'BufReadPre', 'BufNewFile' },
},
{
'saghen/blink.cmp',
dependencies = {
'rafamadriz/friendly-snippets',
'Kaiser-Yang/blink-cmp-avante',
'L3MON4D3/LuaSnip',
version = 'v2.*',
{
'L3MON4D3/LuaSnip',
config = function()
-- Lazy load VSCode-style snippets (including JSON)
require('luasnip.loaders.from_vscode').lazy_load({
paths = {
vim.fn.stdpath('config') .. '/snippets', -- your custom snippets folder
},
})
end,
},
},
version = '*',
config = load_config('lang.blink'),
opts_extend = { 'sources.default' },
@@ -173,29 +194,8 @@ local plugins = {
dependencies = {
'MunifTanjim/nui.nvim',
'nvim-lua/plenary.nvim',
'ravitemer/mcphub.nvim',
},
},
{
'ravitemer/mcphub.nvim',
dependencies = { 'nvim-lua/plenary.nvim' },
cmd = 'MCPHub',
-- build = 'npm install -g mcp-hub@latest', -- use this if you want to use the global mcp-hub
build = 'bundled_build.lua',
config = load_config('ai.mcphub'),
},
-- {
-- 'L3MON4D3/LuaSnip',
-- dependencies = { 'rafamadriz/friendly-snippets' },
-- config = function()
-- -- Lazy load VSCode-style snippets (including JSON)
-- require("luasnip.loaders.from_vscode").lazy_load({
-- paths = {
-- vim.fn.stdpath('config') .. '/snippets', -- your custom snippets folder
-- },
-- })
-- end
-- },
-- Tools
{
@@ -313,27 +313,6 @@ local plugins = {
},
cmd = { 'CodeSnap', 'CodeSnapSave', 'CodeSnapHighlight', 'CodeSnapASCII' },
},
{
'cvigilv/esqueleto.nvim',
event = 'VeryLazy',
opts = {
directories = {
vim.fn.stdpath('config') .. '/templates',
},
patterns = {
-- File
'README',
'LICENSE',
-- Filetype
'sh',
'markdown',
'python',
'lua',
'html',
'vue',
},
},
},
{
'LudoPinelli/comment-box.nvim',
event = 'BufReadPre',
@@ -356,16 +335,12 @@ local plugins = {
},
cmd = { 'CodeSnap', 'CodeSnapSave', 'CodeSnapHighlight', 'CodeSnapASCII' },
},
-- 2kabhishek
{
'2kabhishek/pickme.nvim',
cmd = 'PickMe',
event = 'VeryLazy',
dependencies = {
'folke/snacks.nvim',
-- 'nvim-telescope/telescope.nvim',
-- 'ibhagwan/fzf-lua',
},
opts = {
picker_provider = 'snacks',
@@ -375,59 +350,6 @@ local plugins = {
'2kabhishek/termim.nvim',
cmd = { 'Fterm', 'FTerm', 'Sterm', 'STerm', 'Vterm', 'VTerm' },
},
{
'2kabhishek/octohub.nvim',
cmd = {
'OctoRepos',
'OctoReposByCreated',
'OctoReposByForks',
'OctoReposByIssues',
'OctoReposByLanguages',
'OctoReposByNames',
'OctoReposByPushed',
'OctoReposBySize',
'OctoReposByStars',
'OctoReposByUpdated',
'OctoReposTypeArchived',
'OctoReposTypeForked',
'OctoReposTypePrivate',
'OctoReposTypeStarred',
'OctoReposTypeTemplate',
'OctoRepo',
'OctoStats',
'OctoActivityStats',
'OctoContributionStats',
'OctoRepoStats',
'OctoProfile',
'OctoRepoWeb',
},
keys = {
'<leader>goa',
'<leader>goA',
'<leader>gob',
'<leader>goc',
'<leader>gof',
'<leader>goF',
'<leader>gog',
'<leader>goi',
'<leader>gol',
'<leader>goo',
'<leader>gop',
'<leader>goP',
'<leader>gor',
'<leader>gos',
'<leader>goS',
'<leader>got',
'<leader>goT',
'<leader>gou',
'<leader>goU',
'<leader>gow',
},
dependencies = {
'2kabhishek/utils.nvim',
},
config = load_config('tools.octohub'),
},
-- Optional
{
@@ -455,21 +377,6 @@ local plugins = {
lazy = false,
enabled = util.get_user_config('enable_wakatime', false),
},
{
'JohnnyJumper/neotypist.nvim',
opts = {
notify_interval = 60 * 100, -- one minute
high = 80,
low = 20,
show_virt_text = true,
notify = true,
update_time = 300,
virt_text = function(wpm)
return ('🚀 WPM: %.0f'):format(wpm)
end,
virt_text_pos = 'right_align',
},
},
{
'm4xshen/hardtime.nvim',
dependencies = { 'MunifTanjim/nui.nvim', 'nvim-lua/plenary.nvim' },
@@ -541,6 +448,7 @@ local lsp_servers = {
'typos_lsp',
'vimls',
'lua_ls',
'qmlls',
'tailwindcss', -- Add Tailwind CSS LSP
}
@@ -558,9 +466,10 @@ if util.is_present('go') then
table.insert(lsp_servers, 'gopls')
end
if util.is_present('dart') then
table.insert(lsp_servers, 'dartls')
end
-- dartls comes with Dart SDK, not installed via Mason
-- if util.is_present('dart') then
-- table.insert(lsp_servers, 'dartls')
-- end
if util.is_present('java') then
table.insert(lsp_servers, 'jdtls')
lua/plugins/lock.json
+21 -26
View File
@@ -1,64 +1,59 @@
{
"LuaSnip": { "branch": "master", "commit": "66b5c2707e624dcd2cd3605676c64a2efe47e9d1" },
"LuaSnip": { "branch": "master", "commit": "3d5bced1b9ae69fa3f9b1942e28af5dbc537f946" },
"Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
"avante.nvim": { "branch": "main", "commit": "c20e4e8f05b79015f1c7a2178da5298e431e58a8" },
"base46": { "branch": "v3.0", "commit": "2dbb72f4ae6f78cb3adc60c2c3b69524f97c9cd6" },
"blink-cmp-avante": { "branch": "master", "commit": "5cf0854b065073083de72d9a988cff1c4b419148" },
"avante.nvim": { "branch": "main", "commit": "bd69ae14f6f1f21642e16c16cbd18954f62365aa" },
"base46": { "branch": "v3.0", "commit": "cee12a263602cc97652d3dd55f0fc5e171012967" },
"blink-cmp-avante": { "branch": "master", "commit": "4f494c6e124acbe31a8f5d58effa0c14aa38a6d5" },
"blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" },
"blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" },
"blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
"ccc.nvim": { "branch": "main", "commit": "9d1a256e006decc574789dfc7d628ca11644d4c2" },
"codesnap.nvim": { "branch": "main", "commit": "be6d6b9a3b5e6999edbda76b16dace03d9bfcd3d" },
"comment-box.nvim": { "branch": "main", "commit": "06bb771690bc9df0763d14769b779062d8f12bc5" },
"copilot.lua": { "branch": "master", "commit": "3680bebcc95dfd6c7509466367e66f6dc64a5140" },
"esqueleto.nvim": { "branch": "main", "commit": "d495d8aecf6d8cc87b8f9b82276cd88393ce014b" },
"conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" },
"copilot.lua": { "branch": "master", "commit": "64422b725c4ae102838f3efe832dafb68be2246d" },
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
"gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
"gitsigns.nvim": { "branch": "main", "commit": "7bbc674278f22376850576dfdddf43bbc17e62b5" },
"gitsigns.nvim": { "branch": "main", "commit": "1fcaddcc427ff5802b6602f46de37a5352d0f9e0" },
"hardtime.nvim": { "branch": "main", "commit": "5d9adcbe2f12741de79e435c8b85dca69a3b22e4" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
"lspsaga.nvim": { "branch": "main", "commit": "8efe00d6aed9db6449969f889170f1a7e43101a1" },
"lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
"markit.nvim": { "branch": "main", "commit": "9b031afab214aa6e6467f275f55640989f438925" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "7815740f4d0afb74ada00956c36e18ad695ed9e3" },
"mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" },
"mason-conform.nvim": { "branch": "main", "commit": "f3b96fa2217fcb1513301eefbe10ea0e765e33eb" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "bb3a17efc797c34c054463174e5522442576ebd8" },
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
"mcphub.nvim": { "branch": "main", "commit": "e0b62926d9fa65c81bd0f369b23cbd1eafe3cc6e" },
"mini.ai": { "branch": "main", "commit": "e139eb1101beb0250fea322f8c07a42f0f175688" },
"mini.bracketed": { "branch": "main", "commit": "a54a2a180dc40f4d85875eeafacbdf991d042a36" },
"mini.bracketed": { "branch": "main", "commit": "4a005a6e5aad58230b69f0f59df2cbb8b1c2e643" },
"mini.files": { "branch": "main", "commit": "49c855977e9f4821d1ed8179ed44fe098b93ea2a" },
"mini.pairs": { "branch": "main", "commit": "42407ccb80ec59c84e7c91d815f42ed90a8cc093" },
"mini.pairs": { "branch": "main", "commit": "1e1ca3f60f58d4050bf814902b472eec9963a5dd" },
"mini.surround": { "branch": "main", "commit": "5aab42fcdcf31fa010f012771eda5631c077840a" },
"neotest": { "branch": "master", "commit": "d66cf4e05a116957f0d3a7755a24291c7d1e1f72" },
"neotypist.nvim": { "branch": "master", "commit": "23570aedca4bb4d92967ac82e053cf4d4903abe9" },
"none-ls.nvim": { "branch": "main", "commit": "db2a48b79cfcdab8baa5d3f37f21c78b6705c62e" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-dap": { "branch": "master", "commit": "99807078c5089ed30e0547aa4b52c5867933f426" },
"nvim-dbee": { "branch": "master", "commit": "9656fc59841291e9dbd2f3b50b1cb4c77d9fea79" },
"nvim-lspconfig": { "branch": "master", "commit": "dbdb80d3bd311989d21029c63918d67a786d5013" },
"nvim-lspconfig": { "branch": "master", "commit": "4d3b3bb8815fbe37bcaf3dbdb12a22382bc11ebe" },
"nvim-spectre": { "branch": "master", "commit": "72f56f7585903cd7bf92c665351aa585e150af0f" },
"nvim-spider": { "branch": "main", "commit": "d4bdc45eac425e77108f068bd0706ff3ac20be7f" },
"nvim-spider": { "branch": "main", "commit": "6da0307421bc4be6fe02815faabde51007c4ea1a" },
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
"nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" },
"nvim-treesitter-textsubjects": { "branch": "master", "commit": "abcbb0e537c9c24800b03b9ca33bee5806604629" },
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
"nvim-web-devicons": { "branch": "master", "commit": "a1366758b3a232036dc97be8ca41184aa3f50506" },
"octohub.nvim": { "branch": "main", "commit": "f09627325ab550ca4ff640d4589cf88b8342e63e" },
"pickme.nvim": { "branch": "main", "commit": "70e8c040a6c01b34a6a7e05aff6ebb241211fc6d" },
"nvim-web-devicons": { "branch": "master", "commit": "0422a19d9aa3aad2c7e5cca167e5407b13407a9d" },
"pickme.nvim": { "branch": "main", "commit": "55ca0f1889ea2a4df4b45c77941327a590e025c5" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"showkeys": { "branch": "main", "commit": "cb0a50296f11f1e585acffba8c253b9e8afc1f84" },
"smear-cursor.nvim": { "branch": "main", "commit": "4a0f7ac265b4ed1ce4d0af2afc13072763bfa691" },
"smear-cursor.nvim": { "branch": "main", "commit": "1a3df9af4ed017fafecd93c6837956914f269472" },
"snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
"sniprun": { "branch": "master", "commit": "a90c65846c3c18efc3f799d8b6dc26af9d4a69ed" },
"substitute.nvim": { "branch": "main", "commit": "9db749a880e3dd3b0eb57f698aa8f1e1630e1f25" },
"termim.nvim": { "branch": "main", "commit": "6bb3f8fb5a3c64ca614d7c4782d4965863c41675" },
"termim.nvim": { "branch": "main", "commit": "e4bcf977bef6f6c79996e38fcb9faeccd912007c" },
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
"ui": { "branch": "v3.0", "commit": "4c632329bf2a745c6e06c2012bcf432eb7af3135" },
"utils.nvim": { "branch": "main", "commit": "0e545d194b8eab9870da8e3cdc728fbcfa6a5a19" },
"vim-fugitive": { "branch": "master", "commit": "593f831d6f6d779cbabb70a4d1e6b1b1936a88af" },
"treesj": { "branch": "main", "commit": "3b4a2bc42738a63de17e7485d4cc5e49970ddbcc" },
"ui": { "branch": "v3.0", "commit": "dc4950f5bd4117e2da108b681506c908b93d4a62" },
"vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
"vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" },
"vim-wakatime": { "branch": "master", "commit": "f39c4a201ae350aaba713b59d4a4fdd88e0811aa" },
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
lua/plugins/tools/files.lua
+3 -8
View File
@@ -8,16 +8,11 @@ files.setup({
},
mappings = {
close = 'q',
go_in = 'L',
go_in_plus = 'l',
go_out = 'h',
go_in = '<CR>',
go_in_plus = 'L',
go_out = '-',
go_out_plus = 'H',
mark_goto = "'",
mark_set = 'm',
reset = '<BS>',
reveal_cwd = '@',
show_help = 'g?',
synchronize = '<CR>',
trim_left = '<',
trim_right = '>',
},
lua/plugins/ui/which-key.lua
-60
View File
@@ -110,7 +110,6 @@ local normal_mappings = {
{ '<leader>gi', ':Gitsigns preview_hunk<cr>', desc = 'Hunk Info' },
{ '<leader>gj', ':Gitsigns next_hunk<cr>', desc = 'Next Hunk' },
{ '<leader>gk', ':Gitsigns prev_hunk<cr>', desc = 'Prev Hunk' },
{ '<leader>go', group = 'Octohub' },
{ '<leader>gp', ':Git pull<cr>', desc = 'Pull' },
{ '<leader>gr', ':Gitsigns reset_hunk<cr>', desc = 'Reset Hunk' },
{ '<leader>gt', group = 'Toggle' },
@@ -174,32 +173,6 @@ local normal_mappings = {
{ '<leader>lt', ':Lspsaga goto_type_definition<cr>', desc = 'Goto Type Definition' },
{ '<leader>lT', ':Lspsaga peek_type_definition<cr>', desc = 'Peek Type Definition' },
{ '<leader>m', group = ' Marks' },
{
'<leader>mb',
":lua require('telescope').extensions.markit.bookmarks_list_all()<cr>",
desc = 'Bookmarks',
},
{
'<leader>mB',
":lua require('telescope').extensions.markit.bookmarks_list_all({project_only = true})<cr>",
desc = 'Bookmarks In Project',
},
{ '<leader>md', ":lua require('markit').delete_line()<cr>", desc = 'Delete Marks In Line' },
{ '<leader>mD', ":lua require('markit').delete_buf()<cr>", desc = 'Delete Marks In Buffer' },
{ '<leader>mg', group = 'Group Bookmarks' },
{ '<leader>mG', group = 'Group Bookmarks In Project' },
{ '<leader>mh', ":lua require('markit').prev_bookmark()<cr>", desc = 'Previous Bookmark' },
{ '<leader>mj', ":lua require('markit').next()<cr>", desc = 'Next' },
{ '<leader>mk', ":lua require('markit').prev()<cr>", desc = 'Previous' },
{ '<leader>ml', ":lua require('markit').next_bookmark()<cr>", desc = 'Next Bookmark' },
{ '<leader>mn', group = 'Next Bookmark In Group' },
{ '<leader>mp', group = 'Previous Bookmark In Group' },
{ '<leader>mP', ":lua require('markit').preview()<cr>", desc = 'Preview' },
{ '<leader>ms', ":lua require('markit').set_next()<cr>", desc = 'Set Next' },
{ '<leader>mt', ":lua require('markit').toggle()<cr>", desc = 'Toggle' },
{ '<leader>mx', ":lua require('markit').delete_bookmark()<cr>", desc = 'Delete Bookmark' },
{ '<leader>o', group = ' Options' },
{ '<leader>oi', 'vim.show_pos', desc = 'Inspect Position' },
{ '<leader>oN', ':lua Snacks.notifier.show_history()<cr>', desc = 'Notification History' },
@@ -317,39 +290,6 @@ for i = 1, 9 do
string.format(':LualineBuffersJump%d<cr>', i),
desc = string.format('File %d', i),
})
table.insert(normal_mappings, {
string.format('<leader>m%d', i),
string.format(':lua require("markit").toggle_bookmark%d()<cr>', i),
desc = string.format('Toggle Group %d Bookmark', i),
})
table.insert(normal_mappings, {
string.format('<leader>mp%d', i),
string.format(':lua require("markit").prev_bookmark%d()<cr>', i),
desc = string.format('Previous Group %d Bookmarks', i),
})
table.insert(normal_mappings, {
string.format('<leader>mn%d', i),
string.format(':lua require("markit").next_bookmark%d()<cr>', i),
desc = string.format('Next Group %d Bookmarks', i),
})
table.insert(normal_mappings, {
string.format('<leader>mg%d', i),
string.format(':lua require("telescope").extensions.markit.bookmarks_list_all({group = %d})<cr>', i),
desc = string.format('Group %d Bookmarks', i),
})
table.insert(normal_mappings, {
string.format('<leader>mG%d', i),
string.format(
':lua require("telescope").extensions.markit.bookmarks_list_all({group = %d, project_only = true})<cr>',
i
),
desc = string.format('Group %d Bookmarks In Project', i),
})
end
local visual_mappings = {