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

2 files changed, 9 insertions, 9 deletions

diff --git a/lua/core/nvimtree.lua b/lua/core/nvimtree.lua
index e3df9afb..7ecbe8c2 100644
--- a/lua/core/nvimtree.lua
+++ b/lua/core/nvimtree.lua
@@ -1,8 +1,4 @@
 local M = {}
-local status_ok, nvim_tree_config = pcall(require, "nvim-tree.config")
-if not status_ok then
-  return
-end
 --
 M.config = function()
   O.plugin.nvimtree = {
@@ -50,6 +46,10 @@ M.config = function()
 end
 --
 M.setup = function()
+  local status_ok, nvim_tree_config = pcall(require, "nvim-tree.config")
+  if not status_ok then
+    return
+  end
   local g = vim.g
 
   for opt, val in pairs(O.plugin.nvimtree) do
@@ -65,12 +65,12 @@ M.setup = function()
   }
 end
 --
-local view_status_ok, view = pcall(require, "nvim-tree.view")
-if not view_status_ok then
-  return
-end
 --
 M.toggle_tree = function()
+  local view_status_ok, view = pcall(require, "nvim-tree.view")
+  if not view_status_ok then
+    return
+  end
   if view.win_open() then
     require("nvim-tree").close()
     if package.loaded["bufferline.state"] then
diff --git a/lua/core/telescope.lua b/lua/core/telescope.lua
index 5a067d67..4456d65e 100644
--- a/lua/core/telescope.lua
+++ b/lua/core/telescope.lua
@@ -33,7 +33,7 @@ M.config = function()
       file_sorter = require("telescope.sorters").get_fzy_sorter,
       file_ignore_patterns = {},
       generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter,
-      path_display = { "shorten" },
+      path_display = { shorten = 5 },
       winblend = 0,
       border = {},
       borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" },