init.lua @ f1726ac1ee279f9f04c393166968166cbd65717d

M lua/plugin.lua

@@ -26,10 +26,10 @@ config = get_config "plugin.autopairs",
   }
 
   use {
-      "kyazdani42/nvim-tree.lua",
-      cmd = "NvimTreeToggle",
-      config = get_config "plugin.nvimtree"
-    }
+    "kyazdani42/nvim-tree.lua",
+    cmd = "NvimTreeToggle",
+    config = get_config "plugin.nvimtree",
+  }
 
   use {
     "lewis6991/gitsigns.nvim",
@@ -71,7 +71,7 @@ { "hrsh7th/cmp-buffer", after = "nvim-cmp" },
       { "hrsh7th/cmp-path", after = "nvim-cmp" },
       { "hrsh7th/cmp-cmdline", after = "nvim-cmp" },
       { "saadparwaiz1/cmp_luasnip", after = "nvim-cmp" },
-      { "L3MON4D3/LuaSnip", module = "luasnip" },
+      { "L3MON4D3/LuaSnip", module = "luasnip", after = "nvim-cmp" },
       { "rafamadriz/friendly-snippets", after = "nvim-cmp" },
     },
   }

M lua/plugin/cmp.lua

@@ -3,8 +3,11 @@
 function M.setup()
   local cmp = require "cmp"
 
-  require("luasnip/loaders/from_vscode").lazy_load {
-    paths = { "~/.local/share/nvim/site/pack/packer/start/friendly-snippets" },
+  require("luasnip/loaders/from_vscode").load {
+    paths = {
+      "~/.local/share/nvim/site/pack/packer/start/friendly-snippets",
+      "~/.local/share/nvim/site/pack/packer/opt/friendly-snippets",
+    },
   }
 
   cmp.event:on("confirm_done", require("nvim-autopairs.completion.cmp").on_confirm_done())

M lua/plugin/statusline.lua

@@ -10,10 +10,10 @@ disabled_filetypes = { "NvimTree", "Telescope" },
       always_divide_middle = false,
     },
     sections = {
-      lualine_a = { "branch" },
-      lualine_b = { "filename" },
+      lualine_a = { "filename" },
+      lualine_b = { "branch", "diff" },
       lualine_c = {},
-      lualine_x = { "diff" },
+      lualine_x = {},
       lualine_y = { { "diagnostics", sources = { "nvim_diagnostic" } } },
       lualine_z = { "location" },
     },