diff --git a/lazy-lock.json b/lazy-lock.json index 869b812..89e0ddb 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -9,14 +9,15 @@ "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, "flutter-tools.nvim": { "branch": "main", "commit": "677cc07c16e8b89999108d2ebeefcfc5f539b73c" }, "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" }, - "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a676ab7282da8d651e175118bcf54483ca11e46d" }, "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, + "mini.ai": { "branch": "main", "commit": "bfb26d9072670c3aaefab0f53024b2f3729c8083" }, "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, - "nvim-lspconfig": { "branch": "master", "commit": "dc2f86d2b66a6e01a98c37cdadd3be3e90f8ab9a" }, - "nvim-treesitter": { "branch": "main", "commit": "2cc172c28e5550e00e6beead4599b1469469c1c7" }, + "nvim-lspconfig": { "branch": "master", "commit": "e057806776c8bed91971338d96a78a0f6a313dae" }, + "nvim-treesitter": { "branch": "main", "commit": "2b50ab5ccbcd9e5708deb351308edd738adbf84c" }, "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index a9d1dc3..cf6975f 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -132,6 +132,13 @@ return { [""] = cmp.mapping.scroll_docs(4), [""] = cmp.mapping.complete(), [""] = cmp.mapping.confirm({ select = true }), + [""] = cmp.mapping(function(fallback) -- add this + if cmp.visible() then + cmp.confirm({ select = true }) + else + fallback() + end + end, { "i", "s" }), }), sources = cmp.config.sources({ { name = "nvim_lsp" }, diff --git a/lua/plugins/mini-ai.lua b/lua/plugins/mini-ai.lua new file mode 100644 index 0000000..bf32bb7 --- /dev/null +++ b/lua/plugins/mini-ai.lua @@ -0,0 +1,9 @@ +return { + "echasnovski/mini.ai", + version = "*", + config = function() + require("mini.ai").setup({ + search_method = "next", + }) + end, +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 22a3eda..734b425 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -1,31 +1,31 @@ return { - "nvim-treesitter/nvim-treesitter", - lazy = false, - build = ":TSUpdate", - config = function() - require("nvim-treesitter").setup({ - install_dir = vim.fn.stdpath("data") .. "/site", - highlight = { enable = true }, - indent = { enable = true }, - autotag = { enable = true }, - ensure_installed = { - "lua", - "vim", - "vimdoc", - "query", - "dart", - "python", - "dockerfile", - "yaml", - "bash", - "json", - "html", - "css", - "javascript", - "sql", - "markdown", - "markdown_inline", - }, - }) - end, + "nvim-treesitter/nvim-treesitter", + lazy = false, + build = ":TSUpdate", + config = function() + require("nvim-treesitter").setup({ + install_dir = vim.fn.stdpath("data") .. "/site", + highlight = { enable = true }, + indent = { enable = true }, + autotag = { enable = true }, + ensure_installed = { + "lua", + "vim", + "vimdoc", + "query", + "dart", + "python", + "dockerfile", + "yaml", + "bash", + "json", + "html", + "css", + "javascript", + "sql", + "markdown", + "markdown_inline", + }, + }) + end, }