From ee2dcc3669ffe82ccb8502d028784041d4f4a798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Wed, 2 Aug 2023 10:20:03 +0200 Subject: [PATCH] feat(neovim): luasnip and supertab --- lib/vim/init.lua | 63 +++++++++++++++++++++++++++++------------------- packages/vim.nix | 1 + 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/lib/vim/init.lua b/lib/vim/init.lua index 6fcaa66..d335cb7 100644 --- a/lib/vim/init.lua +++ b/lib/vim/init.lua @@ -1,18 +1,46 @@ -local cmp = require'cmp' +local cmp = require("cmp") +local luasnip = require("luasnip") + +print(vim.g.snippet_directory) +if vim.g.snippet_directory then + require("luasnip.loaders.from_vscode").lazy_load({ + paths = { vim.g.snippet_directory } + }) +end + +luasnip.config.set_config({ + history = true, + updateevents = "TextChanged,TextChangedI", + enable_autosnippets = true +}) cmp.setup({ - snippet = { + snippet = { expand = function(args) - require("luasnip").lsp_expand(args.body) + luasnip.lsp_expand(args.body) end, }, - mapping = cmp.mapping.preset.insert({ - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.abort(), - [''] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. - }), + mapping = { + -- https://github.com/hrsh7th/nvim-cmp/wiki/Example-mappings#super-tab-like-mapping + [''] = 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 + end, {"i", "s"}), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { "i", "s" }), + }, sources = cmp.config.sources({ { name = 'nvim_lsp' }, { name = 'luasnip' }, @@ -21,21 +49,6 @@ cmp.setup({ }) }) --- -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore). --- cmp.setup.cmdline({ '/', '?' }, { --- mapping = cmp.mapping.preset.cmdline(), --- sources = { --- { name = 'buffer' } --- } --- }) - --- -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore). --- cmp.setup.cmdline(':', { --- mapping = cmp.mapping.preset.cmdline(), --- sources = cmp.config.sources({ --- { name = 'path' } --- }) --- }) local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities()) local opts = { noremap=true, silent=true } diff --git a/packages/vim.nix b/packages/vim.nix index 4fdbadb..c01c79f 100644 --- a/packages/vim.nix +++ b/packages/vim.nix @@ -10,6 +10,7 @@ customRC = '' source ${../lib/vim/shared.vim} source ${../lib/vim/init.vim} + let g:snippet_directory = '${vimPlugins.friendly-snippets}' luafile ${../lib/vim/init.lua} ''; packages.nvim = with vimPlugins; {