Skip to content

Commit 089cc46

Browse files
ayamirayamir
committed
Merge branch 'main' into 0.10
Signed-off-by: ayamir <[email protected]>
1 parent 9bf2c26 commit 089cc46

20 files changed

+194
-123
lines changed

‎.github/workflows/update_lockfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v4
1414
with:
1515
fetch-depth: 0 # Required to count the commits
16-
- uses: andstor/file-existence-action@v2
16+
- uses: andstor/file-existence-action@v3
1717
id: check_lockfile
1818
with:
1919
files: "lazy-lock.json"

‎lazy-lock.json

+59-56
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"Comment.nvim": { "branch": "master", "commit": "176e85eeb63f1a5970d6b88f1725039d85ca0055" },
3-
"LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" },
2+
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
3+
"LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" },
44
"accelerated-jk.nvim": { "branch": "main", "commit": "8fb5dad4ccc1811766cebf16b544038aeeb7806f" },
5-
"alpha-nvim": { "branch": "main", "commit": "e4fc5e29b731bdf55d204c5c6a11dc3be70f3b65" },
6-
"autoclose.nvim": { "branch": "main", "commit": "469782b0456f0b4f764378ffda94c18599544e09" },
7-
"better-escape.nvim": { "branch": "master", "commit": "7031dc734add47bb71c010e0551829fa5799375f" },
8-
"bigfile.nvim": { "branch": "main", "commit": "9616b73670ffeb92679677554ded88854ae42cf8" },
9-
"bufferline.nvim": { "branch": "main", "commit": "d24378edc14a675c820a303b4512af3bbc5761e9" },
10-
"catppuccin": { "branch": "refactor/syntax-highlighting", "commit": "1f76a94691b509acb4bf000cd85ba285c4df1c02" },
11-
"clever-f.vim": { "branch": "master", "commit": "6a3ac5e3688598af9411ab741737f98c47370c22" },
5+
"aerial.nvim": { "branch": "master", "commit": "d21482d3be3228dde594aba31106db428292742c" },
6+
"alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" },
7+
"autoclose.nvim": { "branch": "main", "commit": "37e11589aac55b0e8810dc5865f898f9cb36fef6" },
8+
"better-escape.nvim": { "branch": "master", "commit": "7e86edafb8c7e73699e0320f225464a298b96d12" },
9+
"bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" },
10+
"bufferline.nvim": { "branch": "main", "commit": "b15c6daf5a64426c69732b31a951f4e438cb6590" },
11+
"catppuccin": { "branch": "refactor/syntax-highlighting", "commit": "b6f54c74f8aea460b395c4b0ede9392dbab60424" },
1212
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
1313
"cmp-latex-symbols": { "branch": "main", "commit": "165fb66afdbd016eaa1570e41672c4c557b57124" },
1414
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
@@ -18,60 +18,62 @@
1818
"cmp-tmux": { "branch": "main", "commit": "97ec06b8030b8bf6d1fd83d49bdd16c98e04c845" },
1919
"cmp-treesitter": { "branch": "master", "commit": "c8e3a74b51597d69d240085a258636972ce98e15" },
2020
"cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" },
21-
"cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
22-
"copilot-cmp": { "branch": "master", "commit": "c2cdb3c0f5078b0619055af192295830a7987790" },
23-
"copilot.lua": { "branch": "master", "commit": "e48bd7020a98be217d85c006a298656294fd6210" },
24-
"crates.nvim": { "branch": "main", "commit": "4ce7c51b881e58f1e2f8f437f30e4e583cbac319" },
25-
"csv.vim": { "branch": "master", "commit": "15ff93edf5b26c466affbb356e0696b7d6a3b499" },
26-
"diffview.nvim": { "branch": "main", "commit": "e91110d2a7f8e2f667666aba6ea089ff823f8748" },
27-
"edge": { "branch": "master", "commit": "358cb6688ac577470a4eafcb53bdd63899dfc937" },
28-
"fidget.nvim": { "branch": "legacy", "commit": "90c22e47be057562ee9566bad313ad42d622c1d3" },
29-
"friendly-snippets": { "branch": "main", "commit": "ea84a710262cb2c286d439070bad37d36fd3db25" },
21+
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
22+
"copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" },
23+
"copilot.lua": { "branch": "master", "commit": "71382c2efec76647287d46a4fbe0ec8c9809e2ee" },
24+
"crates.nvim": { "branch": "main", "commit": "2bd990871f0aef159933bd5fe6da421690a832b9" },
25+
"csv.vim": { "branch": "master", "commit": "962f88787ec6873eba1c7dbbd81d2723f1ee3c4b" },
26+
"diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
27+
"fidget.nvim": { "branch": "main", "commit": "1d1042d418ee8cb70d68f1e38db639844331c093" },
28+
"flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
29+
"friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" },
30+
"fzf": { "branch": "master", "commit": "1a43259989fc84c0be85829f71ae21815e8d4620" },
3031
"fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" },
31-
"gitsigns.nvim": { "branch": "main", "commit": "adcf2c7f2f495f5df148683764bf7cba6a70f34c" },
32-
"hop.nvim": { "branch": "master", "commit": "31e0e42e629bf16affea747132d9c54f55fb17c8" },
33-
"indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" },
34-
"lazy.nvim": { "branch": "main", "commit": "25beed5e2e935ebc00d7e3eed1dc502df3c40e39" },
35-
"lsp_signature.nvim": { "branch": "master", "commit": "17ff7a405fea8376b015b8ea7910d2e59958bf68" },
36-
"lspsaga.nvim": { "branch": "main", "commit": "20eef6d60780123ac36b3c8b594ca3b2ebf35c9b" },
37-
"lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
38-
"markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
39-
"mason-lspconfig.nvim": { "branch": "main", "commit": "828a538ac8419f586c010996aefa5df6eb7c250b" },
40-
"mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" },
41-
"mason-nvim-dap.nvim": { "branch": "main", "commit": "e4d56b400e9757b1dc77d620fd3069396e92d5fc" },
42-
"mason.nvim": { "branch": "main", "commit": "5ad3e113b0c3fde3caba8630599373046f6197e8" },
32+
"gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
33+
"glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" },
34+
"hop.nvim": { "branch": "master", "commit": "6d853addd6e11df8338b26e869a29b36f2c3e893" },
35+
"indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" },
36+
"lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
37+
"lsp-format-modifications.nvim": { "branch": "main", "commit": "006d4cd88f4f09fdc4375fcb75dd5b7d981a723b" },
38+
"lsp_signature.nvim": { "branch": "master", "commit": "f09644c0390ba49cfe60eafc1f19849dc4c2e814" },
39+
"lspsaga.nvim": { "branch": "main", "commit": "2198c07124bef27ef81335be511c8abfd75db933" },
40+
"lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
41+
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
42+
"mason-lspconfig.nvim": { "branch": "main", "commit": "2b3d247fce06f53934174f5dfe0362c42d65c00c" },
43+
"mason-null-ls.nvim": { "branch": "main", "commit": "a1e19bf9baa86e8a43dd86cf9689ca9f71b4d1da" },
44+
"mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" },
45+
"mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
4346
"neodim": { "branch": "master", "commit": "9477da03b93f1984a81fee3b92e6ac7c6ada6aa4" },
44-
"neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" },
45-
"nord.nvim": { "branch": "master", "commit": "fab04b2dd4b64f4b1763b9250a8824d0b5194b8f" },
46-
"null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" },
47-
"nvim-bufdel": { "branch": "main", "commit": "96c4f7ab053ddab0025bebe5f7c71e4795430e47" },
48-
"nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" },
49-
"nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" },
50-
"nvim-dap": { "branch": "master", "commit": "d17d1bba23ec72a157bd183c57840c39e323f515" },
51-
"nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
52-
"nvim-lspconfig": { "branch": "master", "commit": "447443a2404adc323ad2efc7c0a346a904ce694c" },
53-
"nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
54-
"nvim-scrollview": { "branch": "main", "commit": "9b0b7aeee68700bc7672dfee186d32089a583332" },
55-
"nvim-tree.lua": { "branch": "master", "commit": "3b62c6bf2c3f2973036aed609d02fd0ca9c3af35" },
47+
"neoscroll.nvim": { "branch": "master", "commit": "be4ebf855a52f71ca4338694a5696675d807eff9" },
48+
"none-ls.nvim": { "branch": "main", "commit": "c10b7be7751aee820a02f2d1fafe76bc316fe223" },
49+
"nvim-bqf": { "branch": "main", "commit": "bdc2a4e5bb670b3c0e33ada9c0eec636d93a0748" },
50+
"nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" },
51+
"nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
52+
"nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
53+
"nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" },
54+
"nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" },
55+
"nvim-lspconfig": { "branch": "master", "commit": "9a6279953c82d01b58825a46ede032ab246a5983" },
56+
"nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" },
57+
"nvim-scrollview": { "branch": "main", "commit": "2bc1d94174a977e7147e845156d3c4c12ac06b67" },
58+
"nvim-tree.lua": { "branch": "master", "commit": "f39f7b6fcd3865ac2146de4cb4045286308f2935" },
5659
"nvim-treehopper": { "branch": "master", "commit": "5a28bff46c05d28bdb4bcaef67e046eb915a9390" },
57-
"nvim-treesitter": { "branch": "master", "commit": "4115fad9fded72571bdc3e0f7351e64b31799a3d" },
58-
"nvim-treesitter-context": { "branch": "master", "commit": "6f8f788738b968f24a108ee599c5be0031f94f06" },
59-
"nvim-treesitter-textobjects": { "branch": "master", "commit": "52f1f3280d9092bfaee5c45be5962fabee3d9654" },
60-
"nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" },
61-
"nvim-ts-context-commentstring": { "branch": "main", "commit": "7f625207f225eea97ef7a6abe7611e556c396d2f" },
62-
"nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" },
60+
"nvim-treesitter": { "branch": "master", "commit": "4fbf150a1621d52f17b099506e1a32f107079210" },
61+
"nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" },
62+
"nvim-treesitter-textobjects": { "branch": "master", "commit": "8edd5a6d96936bdff23333d3bc177481388839e5" },
63+
"nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" },
64+
"nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" },
65+
"nvim-web-devicons": { "branch": "master", "commit": "aaec87dbdaa776bfa0a13c8694bec9bcb7454719" },
6366
"paint.nvim": { "branch": "main", "commit": "6ce64212804f425073c61ab0d9c2b034f0435260" },
64-
"persisted.nvim": { "branch": "main", "commit": "b03c863731eafacd973912383297ea5d8fdb006a" },
65-
"plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
67+
"persisted.nvim": { "branch": "main", "commit": "edd8aa41cd87f9da1b6ef0c584068dea192f65b7" },
68+
"plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
6669
"project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
67-
"rainbow-delimiters.nvim": { "branch": "master", "commit": "0d5eb17533a4ed8fe52e3d0e83605cc5875bbe84" },
68-
"rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
69-
"smartyank.nvim": { "branch": "master", "commit": "7e3905578f646503525b2f7018b8afd17861018c" },
70-
"sniprun": { "branch": "master", "commit": "28d55eeb6786a7037fd3564ced8296a71f1cece7" },
71-
"specs.nvim": { "branch": "main", "commit": "2743e412bbe21c9d73954c403d01e8de7377890d" },
70+
"rainbow-delimiters.nvim": { "branch": "master", "commit": "ca8d5ee2b4ee1eec491040a7601d366ddc8a2e02" },
71+
"rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" },
72+
"smartyank.nvim": { "branch": "master", "commit": "b048fec8c6b7d122adab6f78606057d59975ece7" },
73+
"sniprun": { "branch": "master", "commit": "0079f9c4675a6825f84e108bbff866f67dd8762f" },
7274
"suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" },
7375
"tabout.nvim": { "branch": "master", "commit": "0d275c8d25f32457e67b5c66d6ae43f26a61bce5" },
74-
"telescope-frecency.nvim": { "branch": "master", "commit": "9c18474d0a4b82435ce141c2a21d9bd7b9189272" },
76+
"telescope-frecency.nvim": { "branch": "master", "commit": "a61ede8740643f09e1a7706fbb49b152e8f25d42" },
7577
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
7678
"telescope-live-grep-args.nvim": { "branch": "master", "commit": "731a046da7dd3adff9de871a42f9b7fb85f60f47" },
7779
"telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" },
@@ -86,3 +88,4 @@
8688
"vim-matchup": { "branch": "master", "commit": "17cc05867cb3314761e4baa20115a27120f8e82c" },
8789
"which-key.nvim": { "branch": "main", "commit": "38b990f6eabf62014018b4aae70a97d7a6c2eb88" },
8890
"wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" }
91+
}

‎lua/core/event.lua

-10
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,6 @@ vim.api.nvim_create_autocmd("FileType", {
6767
end,
6868
})
6969

70-
-- Fix fold issue of files opened by telescope
71-
vim.api.nvim_create_autocmd("BufRead", {
72-
callback = function()
73-
vim.api.nvim_create_autocmd("BufWinEnter", {
74-
once = true,
75-
command = "normal! zx",
76-
})
77-
end,
78-
})
79-
8070
function autocmd.load_autocmds()
8171
local definitions = {
8272
lazy = {},

‎lua/core/init.lua

+6-3
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,11 @@ end
7575

7676
local leader_map = function()
7777
vim.g.mapleader = " "
78-
vim.api.nvim_set_keymap("n", " ", "", { noremap = true })
79-
vim.api.nvim_set_keymap("x", " ", "", { noremap = true })
78+
-- NOTE:
79+
-- > Uncomment the following if you're using a <leader> other than <Space>, and you wish
80+
-- > to disable advancing one character by pressing <Space> in normal/visual mode.
81+
-- vim.api.nvim_set_keymap("n", " ", "", { noremap = true })
82+
-- vim.api.nvim_set_keymap("x", " ", "", { noremap = true })
8083
end
8184

8285
local gui_config = function()
@@ -164,9 +167,9 @@ local load_core = function()
164167

165168
require("core.options")
166169
require("core.mapping")
167-
require("keymap")
168170
require("core.event")
169171
require("core.pack")
172+
require("keymap")
170173

171174
local colorscheme = settings.colorscheme
172175
local background = settings.background

‎lua/keymap/completion.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function mapping.lsp(buf)
3030
:with_silent()
3131
:with_buffer(buf)
3232
:with_desc("lsp: Next diagnostic"),
33-
["n|<leader>ld"] = map_cr("Lspsaga show_line_diagnostics ++unfocus")
33+
["n|<leader>lx"] = map_cr("Lspsaga show_line_diagnostics ++unfocus")
3434
:with_silent()
3535
:with_buffer(buf)
3636
:with_desc("lsp: Line diagnostic"),
@@ -50,11 +50,11 @@ function mapping.lsp(buf)
5050
["n|gd"] = map_cr("Glance definitions"):with_silent():with_buffer(buf):with_desc("lsp: Preview definition"),
5151
["n|gD"] = map_cr("Lspsaga goto_definition"):with_silent():with_buffer(buf):with_desc("lsp: Goto definition"),
5252
["n|gh"] = map_cr("Glance references"):with_silent():with_buffer(buf):with_desc("lsp: Show reference"),
53-
["n|<leader>ci"] = map_cr("Lspsaga incoming_calls")
53+
["n|gci"] = map_cr("Lspsaga incoming_calls")
5454
:with_silent()
5555
:with_buffer(buf)
5656
:with_desc("lsp: Show incoming calls"),
57-
["n|<leader>co"] = map_cr("Lspsaga outgoing_calls")
57+
["n|gco"] = map_cr("Lspsaga outgoing_calls")
5858
:with_silent()
5959
:with_buffer(buf)
6060
:with_desc("lsp: Show outgoing calls"),

‎lua/keymap/editor.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ local plug_map = {
5757
:with_desc("edit: Toggle comment for block with selection"),
5858

5959
-- Plugin: diffview
60-
["n|<leader>D"] = map_cr("DiffviewOpen"):with_silent():with_noremap():with_desc("git: Show diff"),
61-
["n|<leader><leader>D"] = map_cr("DiffviewClose"):with_silent():with_noremap():with_desc("git: Close diff"),
60+
["n|<leader>gd"] = map_cr("DiffviewOpen"):with_silent():with_noremap():with_desc("git: Show diff"),
61+
["n|<leader>gD"] = map_cr("DiffviewClose"):with_silent():with_noremap():with_desc("git: Close diff"),
6262

6363
-- Plugin: vim-easy-align
6464
["nx|gea"] = map_cr("EasyAlign"):with_desc("edit: Align with delimiter"),
@@ -68,7 +68,7 @@ local plug_map = {
6868
["nv|<leader>j"] = map_cmd("<Cmd>HopLineMW<CR>"):with_noremap():with_desc("jump: Goto line"),
6969
["nv|<leader>k"] = map_cmd("<Cmd>HopLineMW<CR>"):with_noremap():with_desc("jump: Goto line"),
7070
["nv|<leader>c"] = map_cmd("<Cmd>HopChar1MW<CR>"):with_noremap():with_desc("jump: Goto one char"),
71-
["nv|<leader>cc"] = map_cmd("<Cmd>HopChar2MW<CR>"):with_noremap():with_desc("jump: Goto two chars"),
71+
["nv|<leader>C"] = map_cmd("<Cmd>HopChar2MW<CR>"):with_noremap():with_desc("jump: Goto two chars"),
7272

7373
-- Plugin: treehopper
7474
["o|m"] = map_cu("lua require('tsht').nodes()"):with_silent():with_desc("jump: Operate across syntax tree"),

‎lua/keymap/helpers.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ _G._flash_esc_or_noh = function()
1818
if flash_active and state then
1919
state:hide()
2020
else
21-
vim.cmd([[noh]])
21+
pcall(vim.cmd.noh)
2222
end
2323
end
2424

‎lua/keymap/tool.lua

+8-8
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local plug_map = {
99
-- Plugin: vim-fugitive
1010
["n|gps"] = map_cr("G push"):with_noremap():with_silent():with_desc("git: Push"),
1111
["n|gpl"] = map_cr("G pull"):with_noremap():with_silent():with_desc("git: Pull"),
12-
["n|<leader>G"] = map_cu("Git"):with_noremap():with_silent():with_desc("git: Open git-fugitive"),
12+
["n|<leader>gG"] = map_cu("Git"):with_noremap():with_silent():with_desc("git: Open git-fugitive"),
1313

1414
-- Plugin: nvim-tree
1515
["n|<C-n>"] = map_cr("NvimTreeToggle"):with_noremap():with_silent():with_desc("filetree: Toggle"),
@@ -55,7 +55,7 @@ local plug_map = {
5555
:with_silent()
5656
:with_desc("terminal: Toggle float"),
5757
["t|<A-d>"] = map_cmd("<Cmd>ToggleTerm<CR>"):with_noremap():with_silent():with_desc("terminal: Toggle float"),
58-
["n|<leader>g"] = map_callback(function()
58+
["n|<leader>gg"] = map_callback(function()
5959
_toggle_lazygit()
6060
end)
6161
:with_noremap()
@@ -64,23 +64,23 @@ local plug_map = {
6464

6565
-- Plugin: trouble
6666
["n|gt"] = map_cr("TroubleToggle"):with_noremap():with_silent():with_desc("lsp: Toggle trouble list"),
67-
["n|<leader>tr"] = map_cr("TroubleToggle lsp_references")
67+
["n|<leader>ll"] = map_cr("TroubleToggle lsp_references")
6868
:with_noremap()
6969
:with_silent()
7070
:with_desc("lsp: Show lsp references"),
71-
["n|<leader>td"] = map_cr("TroubleToggle document_diagnostics")
71+
["n|<leader>ld"] = map_cr("TroubleToggle document_diagnostics")
7272
:with_noremap()
7373
:with_silent()
7474
:with_desc("lsp: Show document diagnostics"),
75-
["n|<leader>tw"] = map_cr("TroubleToggle workspace_diagnostics")
75+
["n|<leader>lw"] = map_cr("TroubleToggle workspace_diagnostics")
7676
:with_noremap()
7777
:with_silent()
7878
:with_desc("lsp: Show workspace diagnostics"),
79-
["n|<leader>tq"] = map_cr("TroubleToggle quickfix")
79+
["n|<leader>lq"] = map_cr("TroubleToggle quickfix")
8080
:with_noremap()
8181
:with_silent()
8282
:with_desc("lsp: Show quickfix list"),
83-
["n|<leader>tl"] = map_cr("TroubleToggle loclist"):with_noremap():with_silent():with_desc("lsp: Show loclist"),
83+
["n|<leader>lL"] = map_cr("TroubleToggle loclist"):with_noremap():with_silent():with_desc("lsp: Show loclist"),
8484

8585
-- Plugin: telescope
8686
["n|<C-p>"] = map_callback(function()
@@ -121,7 +121,7 @@ local plug_map = {
121121
:with_noremap()
122122
:with_silent()
123123
:with_desc("ui: Change colorscheme for current session"),
124-
["n|<leader>fn"] = map_cu(":enew"):with_noremap():with_silent():with_desc("buffer: New"),
124+
["n|<leader>bn"] = map_cu(":enew"):with_noremap():with_silent():with_desc("buffer: New"),
125125
["n|<leader>fg"] = map_cu("Telescope git_files")
126126
:with_noremap()
127127
:with_silent()

0 commit comments

Comments
 (0)