From 83f73293b88fc8f4d8129573b7412ded6d5563a5 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Tue, 2 Nov 2021 13:40:28 +0100
Subject: vim: lualine: use lualine-lsp-progress

---
 common/vim.nix   |  2 +-
 dotfiles/vim.lua | 26 +++++++-------------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/common/vim.nix b/common/vim.nix
index 2a70864..9bcba5f 100644
--- a/common/vim.nix
+++ b/common/vim.nix
@@ -68,9 +68,9 @@ let
           undotree
           gruvbox-community
           lualine-nvim
+          lualine-lsp-progress
           gitsigns-nvim
           vim-dirvish
-          lsp-status-nvim
           diffview-nvim
 
           nvim-compe
diff --git a/dotfiles/vim.lua b/dotfiles/vim.lua
index 4baaf18..ce04561 100644
--- a/dotfiles/vim.lua
+++ b/dotfiles/vim.lua
@@ -196,24 +196,6 @@ map("n", "<leader>ft", "<cmd>Telescope treesitter<cr>", mapopts)
 
 -- Lualine
 
-local lsp_status = require('lsp-status')
-lsp_status.config {
-	indicator_errors = "err:",
-	indicator_hint = "hint:",
-	indicator_info = "info:",
-	indicator_ok = "ok",
-	indicator_warnings = "warn:",
-	spinner_frames = {""},
-	status_symbol = "lsp:",
-}
-lsp_status.register_progress()
-
-function LspStatus()
-	if #vim.lsp.buf_get_clients() < 1 then return "" end
-
-	return lsp_status.status()
-end
-
 require("lualine").setup {
 	options = {
 		component_separators = "",
@@ -221,7 +203,13 @@ require("lualine").setup {
 		section_separators = "",
 	},
 	sections = {
-		lualine_c = {'filename', LspStatus},
+		lualine_c = {
+			'filename',
+			{
+				'lsp_progress',
+				display_components = { 'lsp_client_name', { 'title', 'percentage', 'message' } },
+			},
+		},
 	},
 }
 
-- 
cgit v1.2.3