nvim: Use snippy and friendly-snippets

3 files changed, 15 insertions, 26 deletions

diff --git a/nvim/.config/nvim/lua/lsp/init.lua b/nvim/.config/nvim/lua/lsp/init.lua
index f0e6a82..08d795f 100644
--- a/nvim/.config/nvim/lua/lsp/init.lua
+++ b/nvim/.config/nvim/lua/lsp/init.lua
@@ -17,13 +17,12 @@ local remap_buf = vim.api.nvim_buf_set_keymap
 local lsp_on_attach = function(client, bufnr)
     if pcall(require, "cmp") and
        pcall(require, "cmp_nvim_lsp") and
-       pcall(require, "luasnip") then
+       pcall(require, "snippy") then
 
 
         require('cmp_nvim_lsp').setup()
 
         local cmp = require('cmp')
-        local ls = require('luasnip')
 
         cmp.setup({
             completion = {
@@ -38,7 +37,7 @@ local lsp_on_attach = function(client, bufnr)
 
             sources = {
                 { name = 'nvim_lsp' },
-                { name = 'luasnip' },
+                { name = 'snippy' },
                 { name = 'path' },
                 { name = 'buffer' },
             },
@@ -52,7 +51,7 @@ local lsp_on_attach = function(client, bufnr)
                     if cmp.visible() then
                         cmp.select_next_item()
                     elseif ls.expand_or_jumpable() then
-                        vim.fn.feedkeys(t('<Plug>luasnip-expand-or-jump'), '')
+                        vim.fn.feedkeys(t('<Plug>(snippy-expand-or-next)'), '')
                     elseif not check_back_space() then
                         cmp.complete()
                     else
@@ -63,7 +62,7 @@ local lsp_on_attach = function(client, bufnr)
                     if cmp.visible() then
                         cmp.select_prev_item()
                     elseif ls.jumpable(-1) then
-                        vim.fn.feedkeys(t('<Plug>luasnip-jump-prev'), '')
+                        vim.fn.feedkeys(t('<Plug>(snippy-previous)'), '')
                     else
                         fallback()
                     end
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index 509ea7c..5a2a49a 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -107,7 +107,7 @@ function Packer:load_packer()
     use {
         'hrsh7th/nvim-cmp',
         config = 'require("plugins.completion")',
-        wants = { "LuaSnip", "cmp_luasnip", "cmp-nvim-lsp", "cmp-buffer", "cmp-path" },
+        wants = { 'cmp-snippy', 'cmp-nvim-lsp', 'cmp-buffer', 'cmp-path' },
     }
     use {
         'hrsh7th/cmp-nvim-lsp',
@@ -125,19 +125,19 @@ function Packer:load_packer()
         after = 'nvim-cmp',
     }
     use {
-        'saadparwaiz1/cmp_luasnip',
-        requires = { 'hrsh7th/nvim-cmp', 'L3MON4D3/LuaSnip' },
+        'dcampos/cmp-snippy',
+        requires = { 'hrsh7th/nvim-cmp', 'dcampos/nvim-snippy' },
         after = 'nvim-cmp',
-        wants = { 'LuaSnip' },
+        wants = { 'snippy' },
     }
 
     use {
-        'L3MON4D3/LuaSnip',
+        'dcampos/nvim-snippy',
         config = 'require("plugins.snippets")',
     }
     use {
-        'rafamadriz/friendly-snippets',
-        wants = { 'LuaSnip' },
+        'honza/vim-snippets',
+        wants = { 'snippy' },
     }
 
     ---------------------------------------------
diff --git a/nvim/.config/nvim/lua/plugins/snippets.lua b/nvim/.config/nvim/lua/plugins/snippets.lua
index 6dffc45..69da58f 100644
--- a/nvim/.config/nvim/lua/plugins/snippets.lua
+++ b/nvim/.config/nvim/lua/plugins/snippets.lua
@@ -3,20 +3,10 @@ local t = function(str)
 end
 local remap = vim.api.nvim_set_keymap
 
-local ls = require('luasnip')
-
-ls.config.set_config {
-    history = true,
-    updateevents = "TextChanged,TextChangedI",
-}
-
-require("luasnip/loaders/from_vscode").lazy_load()
-
-
 local opts = {silent = true, expr = true}
 
-remap('i', '<C-j>', t("luasnip#expand_or_jumpable() ? '<Plug>luasnip-expand-or-jump' : '<C-j>'"), opts)
-remap('s', '<C-j>', t("luasnip#expand_or_jumpable() ? '<Plug>luasnip-expand-or-jump' : '<C-j>'"), opts)
+remap('i', '<C-j>', t("snippy#can_expand_or_advance() ? '<Plug>(snippy-expand-or-next)' : '<C-j>'"), opts)
+remap('s', '<C-j>', t("snippy#can_expand_or_advance() ? '<Plug>(snippy-expand-or-next)' : '<C-j>'"), opts)
 
-remap('i', '<C-k>', t("luasnip#jumpable(-1) ? '<Plug>luasnip-jump-prev' : '<C-k>'"), opts)
-remap('s', '<C-k>', t("luasnip#jumpable(-1) ? '<Plug>luasnip-jump-prev' : '<C-k>'"), opts)
+remap('i', '<C-k>', t("snippy#can_jump(-1) ? '<Plug>(snippy-previous)' : '<C-k>'"), opts)
+remap('s', '<C-k>', t("snippy#can_jump(-1) ? '<Plug>(snippy-previous)' : '<C-k>'"), opts)