From f5dc5ddb58ab0e754fef379e4d0ce785f6fe0883 Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Tue, 25 Oct 2022 00:18:45 +0200 Subject: Replace fidget with lualine-lsp-progress --- fnl/config/fidget.fnl | 6 ------ fnl/config/lualine.fnl | 7 ++++++- fnl/plugins.fnl | 7 ++----- 3 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 fnl/config/fidget.fnl diff --git a/fnl/config/fidget.fnl b/fnl/config/fidget.fnl deleted file mode 100644 index 1b9ca81..0000000 --- a/fnl/config/fidget.fnl +++ /dev/null @@ -1,6 +0,0 @@ -;; Show lsp progress. -(module config.fidget {autoload {util config.util}}) - -(def- opts {:text {:spinner :dots_snake}}) - -(util.setup :fidget opts) diff --git a/fnl/config/lualine.fnl b/fnl/config/lualine.fnl index 833e68e..459909c 100644 --- a/fnl/config/lualine.fnl +++ b/fnl/config/lualine.fnl @@ -52,6 +52,11 @@ :disabled_buftypes [:nvim-tree] :cond hide_in_width}) +(def- lsp-progress {1 :lsp_progress + :display_components [[:title :percentage :message]] + :timer {:progress_enddelay 500 + :lsp_client_name_enddelay 500}}) + (def- opts {:options {:icons_enabled true :theme :auto :component_separators "" @@ -63,7 +68,7 @@ :sections {:lualine_a [:mode] :lualine_b [branch diff] :lualine_c {} - :lualine_x [language-server diagnostics] + :lualine_x [lsp_progress language-server diagnostics] :lualine_y [filetype] :lualine_z [:location :progress]} :inactive_sections {:lualine_a [:mode] diff --git a/fnl/plugins.fnl b/fnl/plugins.fnl index aa2a552..ecabffe 100644 --- a/fnl/plugins.fnl +++ b/fnl/plugins.fnl @@ -44,11 +44,7 @@ :config (fn [] (require :config.gitsigns))}]) -(def lsp [{1 :j-hui/fidget.nvim - :event :BufReadPre - :config (fn [] - (require :config.fidget))} - {1 :williamboman/mason.nvim +(def lsp [{1 :williamboman/mason.nvim :event :BufReadPre :config (fn [] (require :config.lsp.mason))} @@ -168,6 +164,7 @@ :config (fn [] (require :config.lualine)) :requires [:kyazdani42/nvim-web-devicons]} + {1 :arkav/lualine-lsp-progress} {1 :aktersnurra/minibar.nvim :event :BufRead :config (fn [] -- cgit v1.2.3-70-g09d2