Merge branch 'rolling'

1 files changed, 6 insertions, 17 deletions

diff --git a/lua/lvim/utils/hooks.lua b/lua/lvim/utils/hooks.lua
index ab7dfacd..10c3eb20 100644
--- a/lua/lvim/utils/hooks.lua
+++ b/lua/lvim/utils/hooks.lua
@@ -5,33 +5,25 @@ local in_headless = #vim.api.nvim_list_uis() == 0
 
 function M.run_pre_update()
   Log:debug "Starting pre-update hook"
-  if package.loaded["lspconfig"] then
-    vim.cmd [[ LspStop ]]
-  end
 end
 
 function M.run_pre_reload()
   Log:debug "Starting pre-reload hook"
-  if package.loaded["lspconfig"] then
-    vim.cmd [[ LspStop ]]
-  end
 end
 
 function M.run_on_packer_complete()
-  require("lvim.plugin-loader").recompile()
-  -- forcefully activate nvim-web-devicons
-  require("nvim-web-devicons").set_up_highlights()
-  if package.loaded["lspconfig"] then
-    vim.cmd [[ LspStart ]]
-  end
+  -- manually trigger event to fix colors
+  vim.cmd [[ doautocmd ColorScheme ]]
   Log:info "Reloaded configuration"
 end
 
 function M.run_post_reload()
   Log:debug "Starting post-reload hook"
-
-  M.reset_cache()
   require("lvim.plugin-loader").ensure_installed()
+  M.reset_cache()
+  if package.loaded["lspconfig"] then
+    pcall(vim.cmd, "LspRestart")
+  end
 end
 
 ---Reset any startup cache files used by Packer and Impatient
@@ -67,9 +59,6 @@ function M.run_post_update()
       end
       -- TODO: add a changelog
       vim.notify("Update complete", vim.log.levels.INFO)
-      if package.loaded["lspconfig"] then
-        vim.cmd [[ LspStart ]]
-      end
     end)
   end
 end