Skip to content

Commit 9522515

Browse files
pigeonhandspigeonhands
committed
updated plugins, enable flash with <leader>sfs
1 parent 70f6bbd commit 9522515

File tree

4 files changed

+90
-33
lines changed

4 files changed

+90
-33
lines changed

‎.config/nvim/lazy-lock.json

+29-27
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,63 @@
11
{
22
"LazyVim": { "branch": "main", "commit": "5646ee5191da244ff8ea57b9dba8a7e0d1dbdd42" },
3-
"LuaSnip": { "branch": "master", "commit": "825a61bad1d60d917a7962d73cf3c683f4e0407e" },
4-
"SchemaStore.nvim": { "branch": "main", "commit": "32e3a9654693f513a2cbb76ba99cbc9947b1352d" },
3+
"LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
4+
"SchemaStore.nvim": { "branch": "main", "commit": "f660f74bcaae950a77c69dda91270063c8cbd692" },
55
"bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" },
6-
"catppuccin": { "branch": "main", "commit": "aebe43db9cb26e1c70fc5b2fd4158169c405e720" },
6+
"catppuccin": { "branch": "main", "commit": "a1439ad7c584efb3d0ce14ccb835967f030450fe" },
77
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
88
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
99
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
1010
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
11-
"conform.nvim": { "branch": "master", "commit": "9d5ba06d6ee7418c674f498634617416d15b6239" },
12-
"crates.nvim": { "branch": "main", "commit": "b4f4987ccdb1cc3899ee541ef4375c73c48c4570" },
11+
"conform.nvim": { "branch": "master", "commit": "a6965ac128eba75537ec2bc5ddd5d5e357062bdc" },
12+
"crates.nvim": { "branch": "main", "commit": "786d12a70c9b91fa2d0d102bb07df02be0db31a1" },
1313
"dashboard-nvim": { "branch": "master", "commit": "681300934baf36f6184ca41f0b26aed22056d4ee" },
1414
"dressing.nvim": { "branch": "master", "commit": "18e5beb3845f085b6a33c24112b37988f3f93c06" },
15+
"flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
1516
"friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" },
16-
"gitsigns.nvim": { "branch": "main", "commit": "b45ff86f5618d1421a88c12d4feb286b80a1e2d3" },
17+
"gitsigns.nvim": { "branch": "main", "commit": "52f8da33cc0cadbf1164c4a91c8bfd6895533d67" },
1718
"headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" },
1819
"indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
1920
"lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" },
20-
"lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" },
21+
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
2122
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
22-
"mason-lspconfig.nvim": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" },
23+
"mason-lspconfig.nvim": { "branch": "main", "commit": "44509689b9bf3984d729cc264aacb31cb7f41668" },
2324
"mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" },
2425
"mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
2526
"mini.ai": { "branch": "main", "commit": "ee9446a17c160aba6a04ff22097389c41872c878" },
2627
"mini.bufremove": { "branch": "main", "commit": "931a3bb514147d9e812767275c4beba6b779b1d3" },
27-
"mini.comment": { "branch": "main", "commit": "ea3021eb959080a4ed4793733f12a194dfe06edc" },
28-
"mini.indentscope": { "branch": "main", "commit": "cf07f19e718ebb0bcc5b00999083ce11c37b8d40" },
28+
"mini.comment": { "branch": "main", "commit": "f9f1a646fd3d9df7397aa1b9550a875fe8189eb0" },
29+
"mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" },
2930
"mini.pairs": { "branch": "main", "commit": "04f58f2545ed80ac3b52dd4826e93f33e15b2af6" },
30-
"mini.surround": { "branch": "main", "commit": "49e0364b8c9a3258b485c5ece40bb0f3a5e94b1c" },
31-
"neo-tree.nvim": { "branch": "v3.x", "commit": "16d1b194376bf1fc2acd89ccb3c29ba8315bfcea" },
32-
"neoconf.nvim": { "branch": "main", "commit": "8b6326e77d3c01ba330943b5b9037455ce0b4b1f" },
31+
"mini.surround": { "branch": "main", "commit": "d035934958e2605048ee1378ce47cf799f7071d4" },
32+
"neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" },
33+
"neoconf.nvim": { "branch": "main", "commit": "a7da418753379af428f5d26ac91aa6fc18baf86e" },
3334
"neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
3435
"noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" },
35-
"none-ls.nvim": { "branch": "main", "commit": "0d42ba8d506242b2252d2d2885a7f6f4f5b2bcb2" },
36+
"none-ls.nvim": { "branch": "main", "commit": "09a7c58e9283dda582d9805f6b182b5b9f137ec7" },
3637
"nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
3738
"nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" },
3839
"nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" },
39-
"nvim-dap-python": { "branch": "master", "commit": "66560f0ebddf96604f7037e1efad3ba6942761e6" },
40+
"nvim-dap-python": { "branch": "master", "commit": "3dffa58541d1f52c121fe58ced046268c838d802" },
4041
"nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" },
41-
"nvim-dap-virtual-text": { "branch": "master", "commit": "baa5b0dc6663284cce32e0d00ac1f2511b13496f" },
42-
"nvim-lint": { "branch": "master", "commit": "6670b3ac73fa4caf720f017b91c619e9424d955e" },
43-
"nvim-lspconfig": { "branch": "master", "commit": "96e5711040df23583591391ce49e556b8cd248d8" },
44-
"nvim-nio": { "branch": "master", "commit": "173f285eebb410199273fa178aa517fd2d7edd80" },
42+
"nvim-dap-virtual-text": { "branch": "master", "commit": "3e8e207513e6ef520894950acd76b79902714103" },
43+
"nvim-lint": { "branch": "master", "commit": "f098232d70cebe90e27404928c9bc19ca7a5a7b5" },
44+
"nvim-lspconfig": { "branch": "master", "commit": "9266dc26862d8f3556c2ca77602e811472b4c5b8" },
45+
"nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" },
4546
"nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
46-
"nvim-spectre": { "branch": "master", "commit": "2b012554a2536465243c0dff3605b5927c49ed23" },
47-
"nvim-treesitter": { "branch": "master", "commit": "cc0e29727a9651e27869b7444e835c44fb1e7b4c" },
48-
"nvim-treesitter-context": { "branch": "master", "commit": "f19766163c18515fb4d3c12d572bf9cba6cdb990" },
49-
"nvim-treesitter-textobjects": { "branch": "master", "commit": "acffd3476eb340faef0ec07e48060b817386b973" },
47+
"nvim-spectre": { "branch": "master", "commit": "9653847cf2f225648967f6e9363643e327387579" },
48+
"nvim-treesitter": { "branch": "master", "commit": "3e10cffbb2a022cd8e2aaea9f4fffb514065e77c" },
49+
"nvim-treesitter-context": { "branch": "master", "commit": "c24a7a6dc5fde325af844d165323aa6f7082866e" },
50+
"nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" },
5051
"nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
51-
"nvim-ts-context-commentstring": { "branch": "main", "commit": "734ebad31c81c6198dfe102aa23280937c937c42" },
52-
"nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" },
52+
"nvim-ts-context-commentstring": { "branch": "main", "commit": "a6382f744f584bbf71d0a563af789af7190aabda" },
53+
"nvim-web-devicons": { "branch": "master", "commit": "b3468391470034353f0e5110c70babb5c62967d3" },
5354
"omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "6e0aa6465f8fa8ac6c833f6ac4713adfee0202a0" },
5455
"persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" },
5556
"plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" },
56-
"rustaceanvim": { "branch": "master", "commit": "e2dbf91daed26d4dd7263affbecbf9a36e0096e5" },
57+
"rustaceanvim": { "branch": "master", "commit": "3d3818a6e4f88e1ccf40088df0cc3f525e0cbdf8" },
58+
"tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" },
5759
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
58-
"telescope.nvim": { "branch": "master", "commit": "4626aaa2bcfdacf55fd6d44b430e2df81b2403ff" },
60+
"telescope.nvim": { "branch": "master", "commit": "d00d9df48c00d8682c14c2b5da78bda7ef06b939" },
5961
"todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
6062
"tokyonight.nvim": { "branch": "main", "commit": "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5" },
6163
"trouble.nvim": { "branch": "dev", "commit": "10eff94809ecd6ee6cc59f42e9521b9b8a14e9ce" },

‎.config/nvim/lazyvim.json

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"lazyvim.plugins.extras.lang.omnisharp",
88
"lazyvim.plugins.extras.lang.python",
99
"lazyvim.plugins.extras.lang.rust",
10+
"lazyvim.plugins.extras.lang.tailwind",
1011
"lazyvim.plugins.extras.lang.yaml",
1112
"lazyvim.plugins.extras.lsp.none-ls"
1213
],

‎.config/nvim/lua/config/options.lua

+15-5
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ vim.g.loaded_netrwPlugin = 1
2121
vim.o.timeout = true
2222
vim.o.timeoutlen = 500
2323

24+
vim.o.inccommand = "split"
25+
2426
--Set completeopt to have a better completion experience
2527

2628
-- :help completeopt
@@ -29,18 +31,26 @@ vim.o.timeoutlen = 500
2931
-- noselect: Do not select, force to select one from the menu
3032
-- shortness: avoid showing extra messages when using completion
3133
-- updatetime: set updatetime for CursorHold
32-
vim.opt.completeopt = { "menuone", "noselect", "noinsert" }
34+
vim.opt.completeopt = { "menuone", "noselect", "noinsert", "popup" }
3335
vim.opt.shortmess = vim.opt.shortmess + { c = true }
3436
-- vim.api.nvim_set_option('updatetime', 300)
3537

3638
-- Fixed column for diagnostics to appear
3739
-- Show autodiagnostic popup on cursor hover_range
3840
-- Goto previous / next diagnostic warning / error
3941
-- Show inlay_hints more frequently
40-
vim.cmd([[
41-
set signcolumn=yes
42-
autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
43-
]])
42+
vim.opt.signcolumn = "yes"
43+
vim.api.nvim_create_autocmd({ "CursorHold" }, {
44+
pattern = { "*" },
45+
callback = function()
46+
vim.diagnostic.open_float(nil, { focusable = false })
47+
end,
48+
})
49+
-- old config
50+
-- vim.cmd([[
51+
-- set signcolumn=yes
52+
-- autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
53+
-- ]])
4454

4555
--- Higighting
4656
-- gray

‎.config/nvim/lua/plugins/flash.lua

+45-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,53 @@
11
return {
22
{
33
"folke/flash.nvim",
4-
enabled = false,
4+
enabled = true,
55
keys = {
66
{ "s", mode = { "n", "x", "o" }, false },
7+
{ "S", mode = { "n", "x", "o" }, false },
8+
{ "r", mode = "o", false },
9+
{ "R", mode = { "o", "x" }, false },
10+
{ "<c-s>", mode = { "c" }, false },
11+
{
12+
"<leader>sfs",
13+
mode = { "n", "x", "o" },
14+
function()
15+
require("flash").jump()
16+
end,
17+
desc = "Flash",
18+
},
19+
{
20+
"<leader>sfS",
21+
mode = { "n", "x", "o" },
22+
function()
23+
require("flash").treesitter()
24+
end,
25+
desc = "Flash Treesitter",
26+
},
27+
{
28+
"<leader>sfr",
29+
mode = "o",
30+
function()
31+
require("flash").remote()
32+
end,
33+
desc = "Remote Flash",
34+
},
35+
{
36+
"<leader>sfR",
37+
mode = { "o", "x" },
38+
function()
39+
require("flash").treesitter_search()
40+
end,
41+
desc = "Treesitter Search",
42+
},
43+
{
44+
"<c-s>",
45+
mode = { "c" },
46+
function()
47+
require("flash").toggle()
48+
end,
49+
desc = "Toggle Flash Search",
50+
},
751
},
852
},
953
}

0 commit comments

Comments
 (0)