From f9e08bebc79f460c5145b06aa41baa74e55f950c Mon Sep 17 00:00:00 2001 From: S4NKALP Date: Thu, 20 Feb 2025 22:10:21 +0545 Subject: [PATCH] updates --- lua/plugins/lang/blink.lua | 3 +- lua/plugins/list.lua | 4 +- lua/plugins/lock.json | 68 ++++++++++----------- lua/plugins/tools/{marks.lua => markit.lua} | 4 +- lua/plugins/tools/telescope.lua | 2 +- lua/plugins/tools/which-key.lua | 48 +++++++-------- 6 files changed, 65 insertions(+), 64 deletions(-) rename lua/plugins/tools/{marks.lua => markit.lua} (94%) diff --git a/lua/plugins/lang/blink.lua b/lua/plugins/lang/blink.lua index 6008412..12975b9 100644 --- a/lua/plugins/lang/blink.lua +++ b/lua/plugins/lang/blink.lua @@ -7,8 +7,9 @@ blink.setup({ preset = 'enter', [''] = { 'select_next', 'snippet_forward', 'fallback' }, [''] = { 'select_prev', 'snippet_backward', 'fallback' }, + [''] = { 'show', 'hide' }, + [''] = { 'show_documentation', 'hide_documentation' }, }, - -- 'preselect', 'manual', 'auto_insert' completion = { list = { selection = { preselect = false, auto_insert = true } }, menu = { border = 'rounded' }, diff --git a/lua/plugins/list.lua b/lua/plugins/list.lua index fc5f328..a1e0ce2 100644 --- a/lua/plugins/list.lua +++ b/lua/plugins/list.lua @@ -147,7 +147,7 @@ local plugins = { event = { 'BufReadPost', 'BufNewFile' }, keys = { { - 'eM', + 'ee', function() require('mini.files').open(util.get_file_path(), true) end, @@ -338,7 +338,7 @@ local plugins = { { -- 'chentoast/marks.nvim', '2kabhishek/markit.nvim', - config = load_config('tools.marks'), + config = load_config('tools.markit'), event = { 'BufReadPost', 'BufNewFile' }, }, { diff --git a/lua/plugins/lock.json b/lua/plugins/lock.json index 0032cbd..e1fc3f0 100644 --- a/lua/plugins/lock.json +++ b/lua/plugins/lock.json @@ -1,56 +1,56 @@ { "Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" }, - "blink.cmp": { "branch": "main", "commit": "1cc3b1a908fbcfd15451c4772759549724f38524" }, + "blink.cmp": { "branch": "main", "commit": "18b352d12b35bca148427b607098df14b75a218f" }, "ccc.nvim": { "branch": "main", "commit": "b57cbaf8db3ac43c56c9e2c7f3812944638260ed" }, "codeium.vim": { "branch": "main", "commit": "000de972de76f357c03da14f4f8dd9a969d4fe8c" }, "codesnap.nvim": { "branch": "main", "commit": "6400480aa6cc366cbd931146c429aaa64680dab9" }, "comment-box.nvim": { "branch": "main", "commit": "06bb771690bc9df0763d14769b779062d8f12bc5" }, - "dotfyle-metadata.nvim": { "branch": "main", "commit": "342ef8f3f98f3ccc451c9cf2be74e95149ced05d" }, - "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" }, - "esqueleto.nvim": { "branch": "main", "commit": "0f79ccafc931f706d175549c1339848eb8fa8470" }, - "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, + "dotfyle-metadata.nvim": { "branch": "main", "commit": "2062776aa67cf5252f8c9bf3325f9b068205ae9a" }, + "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, + "esqueleto.nvim": { "branch": "main", "commit": "490a02145412fb2cbb8d00b59e806070ed3cbdea" }, + "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" }, - "gitsigns.nvim": { "branch": "main", "commit": "9541f5e8e24571723cb02a5c2bf078aeacc5a711" }, + "gitsigns.nvim": { "branch": "main", "commit": "c3070fcc2e7da1798041219fde8d88f2e4bf7eb5" }, "hardtime.nvim": { "branch": "main", "commit": "5d9adcbe2f12741de79e435c8b85dca69a3b22e4" }, - "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, - "lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" }, - "lspsaga.nvim": { "branch": "main", "commit": "8084e8447bef3f94863949087707e6221a4e5df7" }, - "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, + "lazy.nvim": { "branch": "main", "commit": "e5e9bf48211a13d9ee6c1077c88327c49c1ab4a0" }, + "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, + "lspsaga.nvim": { "branch": "main", "commit": "da8a66c53241876bba140980469876db3a183604" }, + "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "markit.nvim": { "branch": "main", "commit": "6a59bcc5140bed8fcf9cec2cba8d442072b1b76d" }, + "markit.nvim": { "branch": "main", "commit": "4b6428efa721d420aa1377a30b7608255aa56d3f" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, - "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.ai": { "branch": "main", "commit": "40e380a589d07ec2c856940c6422aafe5d949a0d" }, - "mini.bracketed": { "branch": "main", "commit": "0091e11fabe34973fc038a8d0d0485202742e403" }, - "mini.files": { "branch": "main", "commit": "d0f03a5c38836fd2cce3dc80734124959002078c" }, - "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, + "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" }, + "mini.bracketed": { "branch": "main", "commit": "95e1023c1734c805ad3b9da364fc3518e0881c70" }, + "mini.files": { "branch": "main", "commit": "01001e0cfc1e79f581d055ae3f70fbac96a2f378" }, + "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" }, "mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" }, "neotest": { "branch": "master", "commit": "d66cf4e05a116957f0d3a7755a24291c7d1e1f72" }, - "nerdy.nvim": { "branch": "main", "commit": "719ed52244b34ea9de08f074e0d22fd67d615640" }, - "none-ls.nvim": { "branch": "main", "commit": "7bebb35a05871aeb99825f29d869cbd9a46bdbba" }, + "nerdy.nvim": { "branch": "main", "commit": "a086fa89a0716d5a45c6c1bd3804e238ac87eaab" }, + "none-ls.nvim": { "branch": "main", "commit": "f41624ea1a73f020ddbd33438f74abb95ea17d55" }, "nvim-dap": { "branch": "master", "commit": "99807078c5089ed30e0547aa4b52c5867933f426" }, - "nvim-lspconfig": { "branch": "master", "commit": "339ccc81e08793c3af9b83882a6ebd90c9cc0d3b" }, + "nvim-lspconfig": { "branch": "master", "commit": "1110787f1b464888c59a044c48c5119d14078044" }, "nvim-spectre": { "branch": "master", "commit": "ddd7383e856a7c939cb4f5143278fe041bbb8cb9" }, "nvim-spider": { "branch": "main", "commit": "2b38e3e95e143313d78ca098eeecda7aebfce925" }, - "nvim-treesitter": { "branch": "master", "commit": "f0c928dbe93533b7e35894a8f957f40150d1f663" }, + "nvim-treesitter": { "branch": "master", "commit": "a15dd9280f369fef4640e64de794f69456ecdf7a" }, "nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, - "nvim-treesitter-textsubjects": { "branch": "master", "commit": "a8d2844bba925d9450ef7ab215f3b054028288ca" }, - "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" }, + "nvim-treesitter-textsubjects": { "branch": "master", "commit": "9de6c64c41dff29d353ebbedefd033996f29d349" }, + "nvim-web-devicons": { "branch": "master", "commit": "1020869742ecb191f260818234517f4a1515cfe8" }, "onedark.nvim": { "branch": "master", "commit": "67a74c275d1116d575ab25485d1bfa6b2a9c38a6" }, - "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, - "refactoring.nvim": { "branch": "master", "commit": "2db6d378e873de31d18ade549c2edba64ff1c2e3" }, - "snacks.nvim": { "branch": "main", "commit": "60f79f98c2d03fcdc69cb85b3494b2aac2ae3ca5" }, - "sniprun": { "branch": "master", "commit": "67ac2d84d03f3b857d59571ff5fefb6080dffa2d" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" }, - "telescope-undo.nvim": { "branch": "main", "commit": "2971cc9f193ec09e0c5de3563f99cbea16b63f10" }, - "telescope.nvim": { "branch": "0.1.x", "commit": "415af52339215926d705cccc08145f3782c4d132" }, - "termim.nvim": { "branch": "main", "commit": "58344167abb97bcef9bf720a762ea653a94e9daa" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "refactoring.nvim": { "branch": "master", "commit": "74f7aea37b4a5afcab7273f19bff72485c9c5c8a" }, + "snacks.nvim": { "branch": "main", "commit": "956fe69df328d2da924a04061802fb7d2ec5fef6" }, + "sniprun": { "branch": "master", "commit": "151ada2c984aee1feb45c7e3c2abb19f597ecbd0" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "2a5ceff981501cff8f46871d5402cd3378a8ab6a" }, + "telescope-undo.nvim": { "branch": "main", "commit": "928d0c2dc9606e01e2cc547196f48d2eaecf58e5" }, + "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, + "termim.nvim": { "branch": "main", "commit": "3e6aca613bb16dda69633f37d2da17c383eeec9f" }, "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, - "vim-fugitive": { "branch": "master", "commit": "174230d6a7f2df94705a7ffd8d5413e27ec10a80" }, - "vim-wakatime": { "branch": "master", "commit": "cf51327a9e08935569614d1cb24e779ee9f45519" }, - "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" } + "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" }, + "vim-wakatime": { "branch": "master", "commit": "e46d7c4f98ee0f40782008dd60cb2a79c377fb1d" }, + "which-key.nvim": { "branch": "main", "commit": "5bf7a73fe851896d5ac26d313db849bf00f45b78" } } diff --git a/lua/plugins/tools/marks.lua b/lua/plugins/tools/markit.lua similarity index 94% rename from lua/plugins/tools/marks.lua rename to lua/plugins/tools/markit.lua index 04e3d3b..2c67332 100644 --- a/lua/plugins/tools/marks.lua +++ b/lua/plugins/tools/markit.lua @@ -1,7 +1,7 @@ -local marks = require('marks') +local markit = require('markit') local icons = require('lib.icons') -marks.setup({ +markit.setup({ default_mappings = true, builtin_marks = { '.', '<', '>', '^' }, cyclic = true, diff --git a/lua/plugins/tools/telescope.lua b/lua/plugins/tools/telescope.lua index c73ef7c..9c9042a 100644 --- a/lua/plugins/tools/telescope.lua +++ b/lua/plugins/tools/telescope.lua @@ -142,5 +142,5 @@ telescope.setup({ telescope.load_extension('fzf') telescope.load_extension('undo') -telescope.load_extension('marks_nvim') +telescope.load_extension('markit') telescope.load_extension('refactoring') diff --git a/lua/plugins/tools/which-key.lua b/lua/plugins/tools/which-key.lua index aa8691e..a61912a 100644 --- a/lua/plugins/tools/which-key.lua +++ b/lua/plugins/tools/which-key.lua @@ -239,36 +239,36 @@ local normal_mappings = { { 'lt', 'Lspsaga peek_type_definition', desc = 'Peek Type Definition' }, { 'm', group = ' Marks' }, - { 'm1', "lua require('marks').toggle_bookmark1()", desc = 'Toggle Bookmark 0' }, - { 'm2', "lua require('marks').toggle_bookmark2()", desc = 'Toggle Bookmark 2' }, - { 'm3', "lua require('marks').toggle_bookmark3()", desc = 'Toggle Bookmark 3' }, - { 'm4', "lua require('marks').toggle_bookmark4()", desc = 'Toggle Bookmark 4' }, - { 'mD', "lua require('marks').delete_buf()", desc = 'Delete Buffer' }, - { 'mP', "lua require('marks').preview()", desc = 'Preview' }, + { 'm1', "lua require('markit').toggle_bookmark1()", desc = 'Toggle Bookmark 0' }, + { 'm2', "lua require('markit').toggle_bookmark2()", desc = 'Toggle Bookmark 2' }, + { 'm3', "lua require('markit').toggle_bookmark3()", desc = 'Toggle Bookmark 3' }, + { 'm4', "lua require('markit').toggle_bookmark4()", desc = 'Toggle Bookmark 4' }, + { 'mD', "lua require('markit').delete_buf()", desc = 'Delete Buffer' }, + { 'mP', "lua require('markit').preview()", desc = 'Preview' }, { 'mb', - "lua require('telescope').extensions.marks_nvim.bookmarks_list_all()", + "lua require('telescope').extensions.markit_nvim.bookmarks_list_all()", desc = 'Bookmarks', }, - { 'md', "lua require('marks').delete_line()", desc = 'Delete Line' }, - { 'mh', "lua require('marks').next_bookmark()", desc = 'Next Bookmark' }, - { 'mj', "lua require('marks').next()", desc = 'Next' }, - { 'mk', "lua require('marks').prev()", desc = 'Previous' }, - { 'ml', "lua require('marks').prev_bookmark()", desc = 'Previous Bookmark' }, - { 'mm', 'Telescope marks', desc = 'All Marks' }, + { 'md', "lua require('markit').delete_line()", desc = 'Delete Line' }, + { 'mh', "lua require('markit').next_bookmark()", desc = 'Next Bookmark' }, + { 'mj', "lua require('markit').next()", desc = 'Next' }, + { 'mk', "lua require('markit').prev()", desc = 'Previous' }, + { 'ml', "lua require('markit').prev_bookmark()", desc = 'Previous Bookmark' }, + { 'mm', 'Telescope markit', desc = 'All Marks' }, { 'mn', group = 'Next Bookmark Group' }, - { 'mn1', "lua require('marks').next_bookmark1()", desc = 'Next Bookmark 1' }, - { 'mn2', "lua require('marks').next_bookmark2()", desc = 'Next Bookmark 2' }, - { 'mn3', "lua require('marks').next_bookmark3()", desc = 'Next Bookmark 3' }, - { 'mn4', "lua require('marks').next_bookmark4()", desc = 'Next Bookmark 4' }, + { 'mn1', "lua require('markit').next_bookmark1()", desc = 'Next Bookmark 1' }, + { 'mn2', "lua require('markit').next_bookmark2()", desc = 'Next Bookmark 2' }, + { 'mn3', "lua require('markit').next_bookmark3()", desc = 'Next Bookmark 3' }, + { 'mn4', "lua require('markit').next_bookmark4()", desc = 'Next Bookmark 4' }, { 'mp', group = 'Previous Bookmark Group' }, - { 'mp1', "lua require('marks').prev_bookmark1()", desc = 'Previous Bookmark 1' }, - { 'mp2', "lua require('marks').prev_bookmark2()", desc = 'Previous Bookmark 2' }, - { 'mp3', "lua require('marks').prev_bookmark3()", desc = 'Previous Bookmark 3' }, - { 'mp4', "lua require('marks').prev_bookmark4()", desc = 'Previous Bookmark 4' }, - { 'ms', "lua require('marks').set_next()", desc = 'Set Next' }, - { 'mt', "lua require('marks').toggle()", desc = 'Toggle' }, - { 'mx', "lua require('marks').delete_bookmark()", desc = 'Delete Bookmark' }, + { 'mp1', "lua require('markit').prev_bookmark1()", desc = 'Previous Bookmark 1' }, + { 'mp2', "lua require('markit').prev_bookmark2()", desc = 'Previous Bookmark 2' }, + { 'mp3', "lua require('markit').prev_bookmark3()", desc = 'Previous Bookmark 3' }, + { 'mp4', "lua require('markit').prev_bookmark4()", desc = 'Previous Bookmark 4' }, + { 'ms', "lua require('markit').set_next()", desc = 'Set Next' }, + { 'mt', "lua require('markit').toggle()", desc = 'Toggle' }, + { 'mx', "lua require('markit').delete_bookmark()", desc = 'Delete Bookmark' }, { 'o', group = ' Options' }, { 'oc', 'Telescope colorscheme', desc = 'Colorscheme' },