diff options
Diffstat (limited to '.config/nvim')
| -rw-r--r-- | .config/nvim/init.lua | 1 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/completions.lua | 60 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/marks.lua | 3 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/rustaceanvim.lua | 2 | ||||
| -rw-r--r-- | .config/nvim/nvim-pack-lock.json | 45 |
5 files changed, 97 insertions, 14 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index bfc4b5b..160ef63 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -6,5 +6,6 @@ require("configs.lsp") -- Install plugins with native vim.pack -- require("plugins.mason") require("plugins.marks") +require("plugins.completions") require("plugins.render-markdown") require("plugins.rustaceanvim") diff --git a/.config/nvim/lua/plugins/completions.lua b/.config/nvim/lua/plugins/completions.lua new file mode 100644 index 0000000..d994357 --- /dev/null +++ b/.config/nvim/lua/plugins/completions.lua @@ -0,0 +1,60 @@ +-- Autocompletions +-- https://github.com/hrsh7th/nvim-cmp +-- https://github.com/L3MON4D3/LuaSnip +-- https://github.com/saadparwaiz1/cmp_luasnip +-- https://github.com/rafamadriz/friendly-snippets +-- https://github.com/hrsh7th/cmp-nvim-lsp + +vim.pack.add({ + { + src = "https://github.com/hrsh7th/cmp-nvim-lsp", + version = "main", + }, + { + src = "https://github.com/L3MON4D3/LuaSnip", + version = "master", + }, + { + src = "https://github.com/saadparwaiz1/cmp_luasnip", + version = "master", + }, + { + src = "https://github.com/rafamadriz/friendly-snippets", + version = "main", + }, + { + src = "https://github.com/hrsh7th/nvim-cmp", + version = "main", + lazy = "false", + }, +}) + +local cmp = require'cmp' +require("luasnip.loaders.from_vscode").lazy_load() + +cmp.setup({ + snippet = { + expand = function(args) + require('luasnip').lsp_expand(args.body) + end, + }, + window = { + completion = cmp.config.window.bordered(), + documentation = cmp.config.window.bordered(), + }, + mapping = cmp.mapping.preset.insert({ + ['<C-b>'] = cmp.mapping.scroll_docs(-4), + ['<C-f>'] = cmp.mapping.scroll_docs(4), + ['<C-Space>'] = cmp.mapping.complete(), + ['<C-e>'] = cmp.mapping.abort(), + ['<CR>'] = cmp.mapping.confirm({ select = true }), + ['<C-j>'] = cmp.mapping.select_next_item(), + ['<C-k>'] = cmp.mapping.select_prev_item(), + }), + sources = cmp.config.sources({ + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + }, { + { name = 'buffer' }, + }) +}) diff --git a/.config/nvim/lua/plugins/marks.lua b/.config/nvim/lua/plugins/marks.lua index 841d390..e9a273d 100644 --- a/.config/nvim/lua/plugins/marks.lua +++ b/.config/nvim/lua/plugins/marks.lua @@ -1,7 +1,8 @@ vim.pack.add({ { src = 'https://github.com/chentoast/marks.nvim.git', - version = 'main', + version = 'master', + lazy = false, }, }) diff --git a/.config/nvim/lua/plugins/rustaceanvim.lua b/.config/nvim/lua/plugins/rustaceanvim.lua index dee1dc1..72e18d2 100644 --- a/.config/nvim/lua/plugins/rustaceanvim.lua +++ b/.config/nvim/lua/plugins/rustaceanvim.lua @@ -1,7 +1,7 @@ vim.pack.add({ { src = 'https://github.com/mrcjkb/rustaceanvim.git', - version = 'master', + version = 'main', lazy = false, -- This plugin is already lazy }, }) diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json index f9b72cb..e09663c 100644 --- a/.config/nvim/nvim-pack-lock.json +++ b/.config/nvim/nvim-pack-lock.json @@ -1,40 +1,61 @@ { "plugins": { - "marks": { - "rev": "f353e8c08c50f39e99a9ed474172df7eddd89b72", - "src": "https://github.com/chentoast/marks.nvim.git" + "LuaSnip": { + "rev": "a62e1083a3cfe8b6b206e7d3d33a51091df25357", + "src": "https://github.com/L3MON4D3/LuaSnip", + "version": "'master'" + }, + "cmp-nvim-lsp": { + "rev": "cbc7b02bb99fae35cb42f514762b89b5126651ef", + "src": "https://github.com/hrsh7th/cmp-nvim-lsp", + "version": "'main'" + }, + "cmp_luasnip": { + "rev": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90", + "src": "https://github.com/saadparwaiz1/cmp_luasnip", + "version": "'master'" + }, + "friendly-snippets": { + "rev": "6cd7280adead7f586db6fccbd15d2cac7e2188b9", + "src": "https://github.com/rafamadriz/friendly-snippets", + "version": "'main'" }, "marks.nvim": { "rev": "f353e8c08c50f39e99a9ed474172df7eddd89b72", "src": "https://github.com/chentoast/marks.nvim.git", - "version": "'main'" + "version": "'master'" }, "mason-lspconfig.nvim": { - "rev": "4cfe411526a7a99c18281135e8b4765ae6330d15", + "rev": "51feb0ada33d18f3c5c71ffb46005dbf8b33bef4", "src": "https://github.com/mason-org/mason-lspconfig.nvim.git", "version": "'main'" }, "mason.nvim": { - "rev": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800", + "rev": "e54f5bf5f12c560da31c17eee5b3e1bd369f3ff9", "src": "https://github.com/mason-org/mason.nvim.git", "version": "'main'" }, "mini.nvim": { - "rev": "43ec25063430196d36f5fff5758c9101775f3d57", + "rev": "199b3344d4c0dab13e45483834ce11bb7744fa3a", "src": "https://github.com/nvim-mini/mini.nvim" }, + "nvim-cmp": { + "rev": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca", + "src": "https://github.com/hrsh7th/nvim-cmp", + "version": "'main'" + }, "nvim-treesitter": { - "rev": "c6dd314086f7b471bf6c9110092a94ce1c06d220", + "rev": "4916d6592ede8c07973490d9322f187e07dfefac", "src": "https://github.com/nvim-treesitter/nvim-treesitter" }, "render-markdown.nvim": { - "rev": "07d088bf8bdadd159eb807b90eaee86a4778383f", + "rev": "629eb9533ec989d9d5c6cab8f3ad5372422c24e0", "src": "https://github.com/MeanderingProgrammer/render-markdown.nvim" }, "rustaceanvim": { - "rev": "f8bf440870c138bf45bc82c42f55d280569964b8", + "rev": "524d8bedd31c0e5ca6de4fa344750401d109c0af", "src": "https://github.com/mrcjkb/rustaceanvim.git", - "version": "'master'" + "version": "'main'" } } -}
\ No newline at end of file +} |