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

lua/core/lualine/components.lua

@@ -81,9 +81,12 @@ return {
   },
   lsp = {
     function(msg)
-      msg = msg or "LSP Inactive"
+      msg = msg or "LS Inactive"
       local buf_clients = vim.lsp.buf_get_clients()
       if next(buf_clients) == nil then
+        if #msg == 0 then
+          return "LS Inactive"
+        end
         return msg
       end
       local buf_ft = vim.bo.filetype

lua/plugins.lua

@@ -116,7 +116,7 @@ return {
     "terrortylor/nvim-comment",
     event = "BufRead",
     config = function()
-      require("nvim_comment").setup()
+      require("core.comment").setup()
     end,
     disable = not lvim.builtin.comment.active,
   },