Merge branch 'master' of github.com:ChristianChiarulli/LunarVim into stable

2 files changed, 11 insertions, 12 deletions

diff --git a/lua/lv-nvimtree/init.lua b/lua/lv-nvimtree/init.lua
index 5b8110dc..97cfe033 100644
--- a/lua/lv-nvimtree/init.lua
+++ b/lua/lv-nvimtree/init.lua
@@ -1,13 +1,13 @@
---if not package.loaded['nvim-tree.view'] then
---  return
---end
-
+-- --if not package.loaded['nvim-tree.view'] then
+-- --  return
+-- --end
+--
 local M = {}
 local status_ok, nvim_tree_config = pcall(require, "nvim-tree.config")
 if not status_ok then
   return
 end
-
+--
 M.config = function()
   local g = vim.g
 
@@ -69,9 +69,6 @@ local view_status_ok, view = pcall(require, "nvim-tree.view")
 if not view_status_ok then
   return
 end
-
---local view = require "nvim-tree.view"
-
 M.toggle_tree = function()
   if view.win_open() then
     require("nvim-tree").close()
@@ -86,5 +83,5 @@ M.toggle_tree = function()
     require("nvim-tree").find_file(true)
   end
 end
-
+--
 return M
diff --git a/lua/plugins.lua b/lua/plugins.lua
index d8815db8..a637cba4 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -61,7 +61,9 @@ return require("packer").startup(function(use)
 
   use {
     "kyazdani42/nvim-tree.lua",
+    -- event = "BufEnter",
     -- cmd = "NvimTreeToggle",
+    commit = "fd7f60e242205ea9efc9649101c81a07d5f458bb",
     config = function()
       require("lv-nvimtree").config()
     end,
@@ -128,9 +130,9 @@ return require("packer").startup(function(use)
     "ChristianChiarulli/dashboard-nvim",
     event = "BufWinEnter",
     -- cmd = { "Dashboard", "DashboardNewFile", "DashboardJumpMarks" },
-    config = function()
-      require("lv-dashboard").config()
-    end,
+    -- config = function()
+    --   require("lv-dashboard").config()
+    -- end,
     disable = not O.plugin.dashboard.active,
     -- opt = true,
   }