From 58bd5fe93c4fb0040709a330b735ef5523ac15d2 Mon Sep 17 00:00:00 2001
From: rebuilt <memoryman51@hotmail.com>
Date: Wed, 28 Jul 2021 02:00:23 +0200
Subject: [PATCH 1/2] Update README.md

Master now has the changes from rolling
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bf5c1c79..7a04816b 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ The following command installs LunarVim.  Change `LVBRANCH` to the branch you'd
 LVBRANCH=rolling bash <(curl -s https://raw.githubusercontent.com/ChristianChiarulli/lunarvim/rolling/utils/installer/install.sh)
 ```
 
-### BREAKING CHANGE on the rolling branch
+### BREAKING CHANGE on rolling and master branches
 * The latest changes to LunarVim require you to [remove it completely](https://github.com/ChristianChiarulli/LunarVim/wiki/Uninstalling-LunarVim) before upgrading
 * Going forward LunarVim will no longer reside in the nvim configuration folder.  LunarVim has been moved to `~/.local/share/lunarvim`.  
 * To launch Lunarvim use the new `lvim` command.  `nvim` will only launch standard neovim.  

From c07b0c47317f2ae63682204a772d5ce15cb67aac Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Wed, 28 Jul 2021 03:04:51 +0200
Subject: [PATCH 2/2] feat: resolve null-ls tag in galaxyline (#1138)

---
 lua/core/galaxyline.lua | 37 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/lua/core/galaxyline.lua b/lua/core/galaxyline.lua
index abc7c369..1cc855ee 100644
--- a/lua/core/galaxyline.lua
+++ b/lua/core/galaxyline.lua
@@ -200,39 +200,28 @@ table.insert(gls.right, {
   },
 })
 
-local get_lsp_client = function(msg)
+local function get_attached_provider_name(msg)
   msg = msg or "LSP Inactive"
-  local buf_ft = vim.api.nvim_buf_get_option(0, "filetype")
-  local clients = vim.lsp.get_active_clients()
-  if next(clients) == nil then
+
+  local buf_ft = vim.bo.filetype
+  local buf_clients = vim.lsp.buf_get_clients()
+  if next(buf_clients) == nil then
     return msg
   end
-  local lsps = ""
-  for _, client in ipairs(clients) do
-    local filetypes = client.config.filetypes
-    if filetypes and vim.fn.index(filetypes, buf_ft) ~= -1 then
-      -- print(client.name)
-      if lsps == "" then
-        -- print("first", lsps)
-        lsps = client.name
-      else
-        if not string.find(lsps, client.name) then
-          lsps = lsps .. ", " .. client.name
-        end
-        -- print("more", lsps)
-      end
+  local buf_client_names = {}
+  for _, client in pairs(buf_clients) do
+    if client.name == "null-ls" then
+      table.insert(buf_client_names, lvim.lang[buf_ft].linters[1])
+    else
+      table.insert(buf_client_names, client.name)
     end
   end
-  if lsps == "" then
-    return msg
-  else
-    return lsps
-  end
+  return table.concat(buf_client_names, ", ")
 end
 
 table.insert(gls.right, {
   ShowLspClient = {
-    provider = get_lsp_client,
+    provider = get_attached_provider_name,
     condition = function()
       local tbl = { ["dashboard"] = true, [" "] = true }
       if tbl[vim.bo.filetype] then