Merge remote-tracking branch 'origin/rolling'

1 files changed, 11 insertions, 1 deletions

diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua
index 519a203a..f5b9914c 100644
--- a/lua/lvim/plugins.lua
+++ b/lua/lvim/plugins.lua
@@ -69,7 +69,15 @@ local core_plugins = {
   {
     "L3MON4D3/LuaSnip",
     config = function()
-      require("luasnip/loaders/from_vscode").lazy_load()
+      local utils = require "lvim.utils"
+      require("luasnip.loaders.from_lua").lazy_load()
+      require("luasnip.loaders.from_vscode").lazy_load {
+        paths = {
+          utils.join_paths(get_config_dir(), "snippets"),
+          utils.join_paths(get_runtime_dir(), "site", "pack", "packer", "start", "friendly-snippets"),
+        },
+      }
+      require("luasnip.loaders.from_snipmate").lazy_load()
     end,
   },
   {
@@ -182,6 +190,7 @@ local core_plugins = {
     config = function()
       require("lvim.core.bufferline").setup()
     end,
+    branch = "main",
     event = "BufWinEnter",
     disable = not lvim.builtin.bufferline.active,
   },
@@ -217,6 +226,7 @@ local core_plugins = {
   {
     "akinsho/toggleterm.nvim",
     event = "BufWinEnter",
+    branch = "main",
     config = function()
       require("lvim.core.terminal").setup()
     end,