diff --git a/nvim/init.lua b/nvim/init.lua index cf17036..440a400 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -538,41 +538,29 @@ require('lazy').setup({ dependencies = { 'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-path', - 'L3MON4D3/LuaSnip', - 'saadparwaiz1/cmp_luasnip', }, config = function() - local luasnip = require 'luasnip' - - luasnip.config.setup { - -- https://stackoverflow.com/questions/70366949/ - region_check_events = 'CursorHold,InsertLeave', - delete_check_events = 'TextChanged,InsertEnter', - } - local cmp = require 'cmp' cmp.setup { snippet = { expand = function(args) - luasnip.lsp_expand(args.body) + vim.snippet.expand(args.body) end, }, --[[ cfg_lazy_cmp_keymaps ]] mapping = cmp.mapping.preset.insert { + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), [''] = cmp.mapping.complete {}, [''] = cmp.mapping.abort(), [''] = cmp.mapping.confirm { behavior = cmp.ConfirmBehavior.Insert, select = true, }, - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), [''] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() else fallback() end @@ -580,8 +568,6 @@ require('lazy').setup({ [''] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) else fallback() end @@ -589,7 +575,6 @@ require('lazy').setup({ }, sources = { { name = 'nvim_lsp' }, - { name = 'luasnip' }, { name = 'path' }, }, } diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 4251d8a..77a748a 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,9 +1,7 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" }, "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, - "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "desolate.nvim": { "branch": "develop", "commit": "08c59bb2d9e805b206e8128a698bb839a189f1ae" }, "fzf": { "branch": "master", "commit": "9a53d84b9cce3a0be12fb98e313726ecc806f034" }, "fzf-lua": { "branch": "main", "commit": "7d66cd81cf485fb17c22d82021cc166ce332a14c" },