Skip to content

Commit c9e7d3a

Browse files
brycewalkerdevbrycewalkerdev
committed
commit after corruption scare
1 parent 833f3c3 commit c9e7d3a

File tree

3 files changed

+78
-54
lines changed

3 files changed

+78
-54
lines changed

‎lazy-lock.json

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,54 @@
11
{
2-
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
3-
"LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" },
4-
"beacon.nvim": { "branch": "master", "commit": "a786c9a89b2c739c69f9500a2f70f2586c06ec27" },
5-
"betterTerm.nvim": { "branch": "main", "commit": "3d8c20d8f0db9bf6076406ed277fc3153fde2a94" },
6-
"catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" },
7-
"clangd_extensions.nvim": { "branch": "main", "commit": "f36d788f05cfb73d4fd2e606e6ad15f8b842124f" },
8-
"cmake-tools.nvim": { "branch": "master", "commit": "8853f796b0173f34689dd07c8bd654b8fb3f1dc1" },
2+
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
3+
"LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" },
4+
"beacon.nvim": { "branch": "master", "commit": "098ff96c33874339d5e61656f3050dbd587d6bd5" },
5+
"betterTerm.nvim": { "branch": "main", "commit": "e732bbe48e961dbb69e20637360e9982b0c85d3c" },
6+
"catppuccin": { "branch": "main", "commit": "18bab5ec4c782cdf7d7525dbe89c60bfa02fc195" },
7+
"clangd_extensions.nvim": { "branch": "main", "commit": "a8500531c4ed3a207e744a374ea038744a0f93eb" },
8+
"cmake-tools.nvim": { "branch": "master", "commit": "4be3c229fe932043fd83ad52fdf0ba9af7297789" },
99
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
1010
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
1111
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
12-
"friendly-snippets": { "branch": "main", "commit": "d0610077b6129cf9f7f78afbe3a1425d60f6e2f1" },
13-
"gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" },
12+
"friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
13+
"gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" },
1414
"glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" },
15-
"image.nvim": { "branch": "master", "commit": "645f997d171ea3d2505986a0519755600a26f02f" },
16-
"inc-rename.nvim": { "branch": "main", "commit": "7b4828f301d85b72455d6ebaf0d4cf641a0e96aa" },
17-
"indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
18-
"lazy.nvim": { "branch": "main", "commit": "b0ba3f9399bf48c86abaa4db1a40bd0b681d5018" },
19-
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
15+
"image.nvim": { "branch": "master", "commit": "4007cddc4cfc1b5ddd49744a38362e7b0432b3a0" },
16+
"inc-rename.nvim": { "branch": "main", "commit": "8ba77017ca468f3029bf88ef409c2d20476ea66b" },
17+
"indent-blankline.nvim": { "branch": "master", "commit": "dddb5d21811c319eb6e51a993d8fb44b193aae3f" },
18+
"lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
19+
"lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
2020
"luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" },
21-
"mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
22-
"mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" },
23-
"mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
21+
"mason-lspconfig.nvim": { "branch": "main", "commit": "1c55991321d1a861537e32446affc5de5d9a6eaf" },
22+
"mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" },
23+
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
2424
"nabla.nvim": { "branch": "master", "commit": "27a6ea9ed7452bb9e0b19eb0942b5bcf7d051b2f" },
2525
"neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
26-
"neodev.nvim": { "branch": "main", "commit": "1f4ebcc10852518166ce165e57d425a4265a10d4" },
27-
"neogen": { "branch": "main", "commit": "6de0add4805165317ab7d3d36b5cef48b1b865f3" },
28-
"noice.nvim": { "branch": "main", "commit": "69c6ad5c1f1c0777125d0275f9871d8609cb0521" },
29-
"nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" },
30-
"nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
31-
"nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
32-
"nvim-dap": { "branch": "master", "commit": "7122fd5848919a9aeff8c52bd9e71cbc51d0c90e" },
33-
"nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
34-
"nvim-lspconfig": { "branch": "master", "commit": "74e14808cdb15e625449027019406e1ff6dda020" },
35-
"nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" },
36-
"nvim-treesitter": { "branch": "master", "commit": "a80fe081b4c5890980561e0de2458f64aaffbfc7" },
37-
"nvim-treesitter-textobjects": { "branch": "master", "commit": "fd41b7ccc5490a3a99c734d1ee418b68d06c48a9" },
38-
"nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
39-
"obsidian.nvim": { "branch": "main", "commit": "0e9bc3a8fcbc3259dbf747c53d796ed329822c2c" },
26+
"neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
27+
"neogen": { "branch": "main", "commit": "2cad4d6fe9fb7d359ef60f169cf4dad8eb17d6c5" },
28+
"noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" },
29+
"nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
30+
"nvim-autopairs": { "branch": "master", "commit": "48ca9aaee733911424646cb1605f27bc01dedbe3" },
31+
"nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
32+
"nvim-dap": { "branch": "master", "commit": "2b428ff2632e73295e9decbcf1c40d8e26213305" },
33+
"nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" },
34+
"nvim-lspconfig": { "branch": "master", "commit": "a89de2e049b5f89a0ee55029d5a31213bd4de6f8" },
35+
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
36+
"nvim-treesitter": { "branch": "master", "commit": "6d74da7f0a29c35ee7636e157e72dd221e8d6197" },
37+
"nvim-treesitter-textobjects": { "branch": "master", "commit": "ced6375723b20616282f9f6a1018a63ae19b106a" },
38+
"nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" },
39+
"obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
4040
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
41-
"rainbow-delimiters.nvim": { "branch": "master", "commit": "0f314613125fdd7c85faaee3c87051611d883253" },
41+
"rainbow-delimiters.nvim": { "branch": "master", "commit": "c097f728a409d9923a3c70c1507e8389978a9b85" },
4242
"suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" },
43-
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
43+
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
4444
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
4545
"telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
46-
"todo-comments.nvim": { "branch": "main", "commit": "70a93ce66083699571adc361166504b03cc39c2b" },
47-
"tree-sitter-hyprlang": { "branch": "master", "commit": "e5da7d0aa44403153e0394d87d9edea4e5bd6609" },
48-
"trouble.nvim": { "branch": "dev", "commit": "8a0394ce7c38d961b355160dfc1e4ab77b9a38d7" },
49-
"vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" },
46+
"todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" },
47+
"tree-sitter-hyprlang": { "branch": "master", "commit": "6858695eba0e63b9e0fceef081d291eb352abce8" },
48+
"vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" },
5049
"vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
5150
"vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
5251
"vim-startify": { "branch": "master", "commit": "4e089dffdad46f3f5593f34362d530e8fe823dcf" },
53-
"which-key.nvim": { "branch": "main", "commit": "4b7167f8fb2dba3d01980735e3509e172c024c29" },
52+
"which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" },
5453
"window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" }
55-
}
54+
}

‎lua/lsp-cfg.lua

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,47 @@ local on_attach = function(_, bufnr)
4444
end
4545

4646
-- document existing key chains
47-
require('which-key').register {
48-
['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
49-
['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
50-
['<leader>g'] = { name = '[G]it', _ = 'which_key_ignore' },
51-
['<leader>h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' },
52-
['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
53-
['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
54-
['<leader>t'] = { name = '[T]oggle', _ = 'which_key_ignore' },
55-
['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
56-
}
47+
require('which-key').add({
48+
{ "<leader>c", group = "[C]ode" },
49+
{ "<leader>c_", hidden = true },
50+
{ "<leader>d", group = "[D]ocument" },
51+
{ "<leader>d_", hidden = true },
52+
{ "<leader>g", group = "[G]it" },
53+
{ "<leader>g_", hidden = true },
54+
{ "<leader>h", group = "Git [H]unk" },
55+
{ "<leader>h_", hidden = true },
56+
{ "<leader>r", group = "[R]ename" },
57+
{ "<leader>r_", hidden = true },
58+
{ "<leader>s", group = "[S]earch" },
59+
{ "<leader>s_", hidden = true },
60+
{ "<leader>t", group = "[T]oggle" },
61+
{ "<leader>t_", hidden = true },
62+
{ "<leader>w", group = "[W]orkspace" },
63+
{ "<leader>w_", hidden = true },
64+
65+
})
66+
-- require('which-key').register {
67+
-- ['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
68+
-- ['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
69+
-- ['<leader>g'] = { name = '[G]it', _ = 'which_key_ignore' },
70+
-- ['<leader>h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' },
71+
-- ['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
72+
-- ['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
73+
-- ['<leader>t'] = { name = '[T]oggle', _ = 'which_key_ignore' },
74+
-- ['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
75+
-- }
5776
-- register which-key VISUAL mode
5877
-- required for visual <leader>hs (hunk stage) to work
59-
require('which-key').register({
60-
['<leader>'] = { name = 'VISUAL <leader>' },
61-
['<leader>h'] = { 'Git [H]unk' },
62-
}, { mode = 'v' })
78+
-- require('which-key').register({
79+
-- ['<leader>'] = { name = 'VISUAL <leader>' },
80+
-- ['<leader>h'] = { 'Git [H]unk' },
81+
-- }, { mode = 'v' })
82+
83+
require("which-key").add({
84+
mode = { "v" },
85+
{ "<leader>", group = "VISUAL <leader>", mode = "v" },
86+
{ "<leader>h", desc = "Git [H]unk", mode = "v" },
87+
})
6388

6489
-- mason-lspconfig requires that these setup functions are called in this order
6590
-- before setting up the servers.

‎lua/plugin-manifest.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ return {
3232
require('plugins/cmake-tools'),
3333
require('plugins/suda'),
3434
require('plugins.nabla'),
35-
require('plugins.errors'),
35+
-- require('plugins.errors'),
3636
require('plugins.win-picker'),
3737
require('plugins.clangd-extensions'),
3838
require('plugins.terminal'),

0 commit comments

Comments
 (0)