From 610c1a9a8340802e7cb687722e8644c96589dcc1 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Tue, 26 Apr 2022 08:42:45 +0200
Subject: [PATCH] feat: add lsp-status to lualine

---
 nvim/lua/plugins.lua                |  8 +++++++-
 nvim/lua/plugins/nvim-lsp-setup.lua | 14 +++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index b7714de..db24154 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -31,7 +31,7 @@ return require('packer').startup(function(use)
     -- commenting
     use {
         'numToStr/Comment.nvim',
-        config = function() require('Comment').setup() end
+        config = function() require('Comment').setup({}) end
     }
 
     -- session handling
@@ -60,6 +60,9 @@ return require('packer').startup(function(use)
         config = function()
             require('lualine').setup({
                 options = { globalstatus = true },
+                sections = {
+                    lualine_c = { "filename", "require('lsp-status').status()" }
+                },
                 extensions = { "toggleterm" }
             })
         end
@@ -122,6 +125,9 @@ return require('packer').startup(function(use)
 
             -- lua plugin development
             "folke/lua-dev.nvim",
+
+            -- lsp status
+            "nvim-lua/lsp-status.nvim",
         },
         config = function() require('plugins.nvim-lsp-setup') end,
     }
diff --git a/nvim/lua/plugins/nvim-lsp-setup.lua b/nvim/lua/plugins/nvim-lsp-setup.lua
index 086fd97..a4d7f54 100644
--- a/nvim/lua/plugins/nvim-lsp-setup.lua
+++ b/nvim/lua/plugins/nvim-lsp-setup.lua
@@ -1,3 +1,13 @@
+local lsp_status = require("lsp-status")
+lsp_status.config({
+    current_function = false,
+    show_filename = false,
+    diagnostics = true,
+})
+lsp_status.register_progress()
+
+local utils = require("nvim-lsp-setup.utils")
+
 require("nvim-lsp-setup").setup({
     default_mappings = false,
     mappings = {
@@ -17,9 +27,11 @@ require("nvim-lsp-setup").setup({
         ["<C-n>"] = "lua vim.diagnostic.goto_next()",
     },
     on_attach = function(client)
-        require("nvim-lsp-setup.utils").format_on_save(client)
+        utils.format_on_save(client)
         require("illuminate").on_attach(client)
+        lsp_status.on_attach(client)
     end,
+    capabilities = vim.tbl_extend("keep", vim.lsp.protocol.make_client_capabilities(), lsp_status.capabilities),
     servers = {
         ansiblels = {},
         bashls = {},