nvim: tidy luasnip

diff --git a/nvim/lua/plugins/blink.lua b/nvim/lua/plugins/blink.lua
index bdfee753e9b1cbd52b92ac2d6deb6f629083020b..e98ae95147512d6e36d46d3638ff624a3d7fc017 100644 (file)
--- a/nvim/lua/plugins/blink.lua
+++ b/nvim/lua/plugins/blink.lua
@@ -29,6 +29,9 @@ return {
       sources = {
         default = { "lsp", "path", "snippets", "buffer" },
       },
+      snippets = {
+        preset = "luasnip",
+      },
 
       keymap = {
         preset = "enter",
@@ -73,4 +76,3 @@ return {
     },
   },
 }
-

diff --git a/nvim/lua/plugins/coding.lua b/nvim/lua/plugins/coding.lua
index 4fe8c083086078e9254fe56b2bc5a828270a0a65..1be8db3160c33f91c6379a36dce5ecb7391f4068 100644 (file)
--- a/nvim/lua/plugins/coding.lua
+++ b/nvim/lua/plugins/coding.lua
@@ -1,22 +1,22 @@
 ---@type LazySpec
 return {
   -- snippets
-  {
-    "L3MON4D3/LuaSnip",
-    -- disable luasnip bindings for <tab> and <s-tab>
+  { "l3mon4d3/luasnip",
+    build = "make install_jsregexp", -- optional
     dependencies = {
-      {
-        "honza/vim-snippets",
-        config = function()
-          require("luasnip.loaders.from_snipmate").lazy_load()
-          require("luasnip.loaders.from_lua").load({ paths = vim.fn.stdpath("config") .. "/lua/snippets" })
-        end,
-      },
+      { "honza/vim-snippets", },
     },
+    config = function()
+      local snippets = vim.fn.stdpath("config").."/snippets"
+      require("luasnip.loaders.from_snipmate").load({ paths = { snippets }})
+      require("luasnip.loaders.from_lua").load({ paths = { snippets }})
+    end,
     keys = function()
       return {}
     end,
     opts = {
+      history = true,
+      delete_check_events = "TextChanged",
       store_selection_keys = "<Tab>",
     },
   },

diff --git a/nvim/lua/snippets/all.lua b/nvim/snippets/all.lua
similarity index 100%
rename from nvim/lua/snippets/all.lua
rename to nvim/snippets/all.lua

diff --git a/nvim/snippets/all.snippets b/nvim/snippets/all.snippets
new file mode 100644 (file)
index 0000000..1d91cec
--- /dev/null
+++ b/nvim/snippets/all.snippets
@@ -0,0 +1,2 @@
+# Add TextMate style snippets here
+# see https://github.com/L3MON4D3/LuaSnip/blob/master/DOC.md#snipmate