From d96f24b86e783c1b6345cc180f8ab4bc5adae43e Mon Sep 17 00:00:00 2001 From: Felipe Contreras Salinas Date: Fri, 20 Sep 2024 00:57:13 -0300 Subject: [PATCH] lazy: fix cmp and telescope dependencies --- lazy-lock.json | 16 ++++++++-------- lua/plugins/cmp.lua | 18 +++++------------- lua/plugins/telescope.lua | 16 ++++++---------- 3 files changed, 19 insertions(+), 31 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 6988128..a76957a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,10 +1,10 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "completion-buffers": { "branch": "master", "commit": "c36871b2a44b59761387f4972c617b44dcec5e75" }, "conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" }, "core.nvim": { "branch": "main", "commit": "26ada48758e73ff3763ac134a9a0da320a7762e4" }, "crates.nvim": { "branch": "main", "commit": "5a24e3ba60e28e0cfde540696630b3c5a4db6dfd" }, @@ -17,21 +17,21 @@ "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }, "lsp_lines.nvim": { "branch": "main", "commit": "7d9e2748b61bff6ebba6e30adbc7173ccf21c055" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "neogit": { "branch": "master", "commit": "e0a8674ac6b6048e1e4d364645dc605ac789bc4a" }, + "neogit": { "branch": "master", "commit": "9959b58a897036ce89d47385021db1f716613399" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-colorizer.lua": { "branch": "master", "commit": "0671e0eabc6842676d3310370e8fae4e1c51d7f9" }, - "nvim-lint": { "branch": "master", "commit": "99cab0b885aaa2f59736c047d23e9a7835d4f9a9" }, - "nvim-lspconfig": { "branch": "master", "commit": "73e0002b6f211376bbf36c31a2f812aedf6bd6b0" }, + "nvim-lint": { "branch": "master", "commit": "ba0ab2f813e77d015da1a1c9920328fd2bf295f2" }, + "nvim-lspconfig": { "branch": "master", "commit": "aaec5d049af99e7b975bdf68aca582f1aa91b338" }, "nvim-osc52": { "branch": "main", "commit": "04cfaba1865ae5c53b6f887c3ca7304973824fb2" }, "nvim-rc": { "branch": "main", "commit": "1d86e61e2256789b23da5071f21a973587e87e66" }, "nvim-spider": { "branch": "main", "commit": "b1c542a78522d59432a827f6ec2b28f9422c7e7f" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, - "nvim-treesitter": { "branch": "master", "commit": "3c6af36794b26e1bcac3f126b43e0f646154725d" }, - "nvim-web-devicons": { "branch": "master", "commit": "9154484705968658e9aab2b894d1b2a64bf9f83d" }, + "nvim-treesitter": { "branch": "master", "commit": "2b2ac302324f4cd2194c5dcaa59332b65e1c6403" }, + "nvim-web-devicons": { "branch": "master", "commit": "31bd21ac46b2b6039aa0b856ca02b018cf549ef7" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, + "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" }, "telescope-luasnip.nvim": { "branch": "master", "commit": "11668478677de360dea45cf2b090d34f21b8ae07" }, - "telescope.nvim": { "branch": "master", "commit": "0df05c9e9f791dbc542c1fb612195f4dc97209b6" }, + "telescope.nvim": { "branch": "master", "commit": "b5fd7f7ae0ea4537511077ed8ef4a6021cedba2f" }, "typst-preview.nvim": { "branch": "main", "commit": "44404d931c2508a839c1770ae0decab5f068fae2" }, "typst.vim": { "branch": "main", "commit": "4d18ced62599ffe5b3c0e5e49566d5456121bc02" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index fb6b90b..ae62b50 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -1,6 +1,11 @@ return { { "hrsh7th/nvim-cmp", + dependencies = { + "hrsh7th/cmp-buffer", + "hrsh7th/cmp-path", + "saadparwaiz1/cmp_luasnip", + }, opts = function() local cmp = require("cmp") ---@diagnostic disable-next-line: redundant-parameter @@ -32,17 +37,4 @@ return { }) end }, - { - "steelsojka/completion-buffers", - dependencies = { - "hrsh7th/nvim-cmp", - }, - enabled = false, - }, - { - "hrsh7th/cmp-path", - }, - { - "saadparwaiz1/cmp_luasnip", - } } diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index c90908d..4afdd9a 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -6,15 +6,15 @@ return { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons", { - "nvim-telescope/telescope-fzf-native.nvim", + "nvim-telescope/telescope-fzy-native.nvim", build = "make", }, }, keys = { - {"b", require("telescope.builtin").buffers, desc = "Telescope buffers"}, - {"f", require("telescope.builtin").find_files, desc = "Telescope find files"}, - {"g", require("telescope.builtin").live_grep, desc = "Telescope live grep"}, - {"/", require("telescope.builtin").current_buffer_fuzzy_find, desc = "Telescope current buffer fuzzy find"}, + { "b", require("telescope.builtin").buffers, desc = "Telescope buffers" }, + { "f", require("telescope.builtin").find_files, desc = "Telescope find files" }, + { "g", require("telescope.builtin").live_grep, desc = "Telescope live grep" }, + { "/", require("telescope.builtin").current_buffer_fuzzy_find, desc = "Telescope current buffer fuzzy find" }, }, config = function() local telescope = require("telescope") @@ -28,13 +28,9 @@ return { }, }, }) - -- telescope.load_extension("fzy_native") + telescope.load_extension("fzy_native") telescope.load_extension("luasnip") local builtin = require("telescope.builtin") - -- vim.keymap.set("n", "f", builtin.find_files) - -- vim.keymap.set("n", "b", builtin.buffers) - -- vim.keymap.set("n", "/", builtin.current_buffer_fuzzy_find) - -- vim.keymap.set("n", "g", builtin.live_grep) vim.keymap.set("n", "cg", builtin.grep_string) vim.keymap.set("n", ":", builtin.commands) vim.keymap.set("n", "s", telescope.extensions.luasnip.luasnip)