From fefabf2237ee6c8bc0fd404bfa7d7f600f6387fa Mon Sep 17 00:00:00 2001 From: Phelipe Teles Date: Wed, 7 Jun 2023 11:51:50 -0300 Subject: [PATCH] Add fidget.nvim plugin --- .config/nvim/init.lua | 1 + .config/nvim/lua/helpers/tabline.lua | 1 - .config/nvim/lua/plugins/config/lsp.lua | 19 +++++++++++-------- .config/nvim/pack/plugins/opt/fidget.nvim | 1 + .config/nvim/pack/plugins/opt/nvim-lspconfig | 2 +- .gitmodules | 3 +++ 6 files changed, 17 insertions(+), 10 deletions(-) create mode 160000 .config/nvim/pack/plugins/opt/fidget.nvim diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 8b47eb4f..ca58d3c8 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -80,6 +80,7 @@ vim.cmd("packadd! cmp-buffer") vim.cmd("packadd! nvim-cmp") vim.cmd("packadd! cmp-vsnip") vim.cmd("packadd! vim-vsnip") +vim.cmd("packadd! fidget.nvim") require("plugins.config.lsp") -- incremental search/substitute highlighting diff --git a/.config/nvim/lua/helpers/tabline.lua b/.config/nvim/lua/helpers/tabline.lua index 2a2efd4f..d09a9cda 100644 --- a/.config/nvim/lua/helpers/tabline.lua +++ b/.config/nvim/lua/helpers/tabline.lua @@ -46,7 +46,6 @@ M.get = function() table.insert(tabline, "%#TabLineFill#") table.insert(tabline, "%=") - table.insert(tabline, vim.g.coc_status) return table.concat(tabline, "") end diff --git a/.config/nvim/lua/plugins/config/lsp.lua b/.config/nvim/lua/plugins/config/lsp.lua index 9c0c08c8..2d04e30d 100644 --- a/.config/nvim/lua/plugins/config/lsp.lua +++ b/.config/nvim/lua/plugins/config/lsp.lua @@ -53,11 +53,16 @@ cmp.setup({ -- }}} -- {{{ lspconfig +local fidget = require("fidget") +fidget.setup() + local lspconfig = require("lspconfig") local cmp_capabilities = require("cmp_nvim_lsp").default_capabilities() + +local capabilities = cmp_capabilities local opts = { - capabilities = cmp_capabilities, + capabilities = capabilities, } lspconfig.tsserver.setup(opts) @@ -66,24 +71,22 @@ lspconfig.lua_ls.setup(opts) lspconfig.html.setup(opts) lspconfig.cssls.setup(opts) lspconfig.jsonls.setup(opts) -lspconfig.tailwindcss.setup({ - capabilities = cmp_capabilities, +lspconfig.tailwindcss.setup(vim.tbl_extend("force", opts, { settings = { tailwindCSS = { classAttributes = { "class", "class:list", "className", "classList", "ngClass" }, validate = true, }, }, -}) -lspconfig.eslint.setup({ - capabilities = cmp_capabilities, - on_attach = function(_, bufnr) +})) +lspconfig.eslint.setup(vim.tbl_extend("force", opts, { + on_attach = function(client, bufnr) vim.api.nvim_create_autocmd("BufWritePre", { buffer = bufnr, command = "EslintFixAll", }) end, -}) +})) -- }}} -- {{{ handlers diff --git a/.config/nvim/pack/plugins/opt/fidget.nvim b/.config/nvim/pack/plugins/opt/fidget.nvim new file mode 160000 index 00000000..0ba1e16d --- /dev/null +++ b/.config/nvim/pack/plugins/opt/fidget.nvim @@ -0,0 +1 @@ +Subproject commit 0ba1e16d07627532b6cae915cc992ecac249fb97 diff --git a/.config/nvim/pack/plugins/opt/nvim-lspconfig b/.config/nvim/pack/plugins/opt/nvim-lspconfig index 00d7063c..680d97ab 160000 --- a/.config/nvim/pack/plugins/opt/nvim-lspconfig +++ b/.config/nvim/pack/plugins/opt/nvim-lspconfig @@ -1 +1 @@ -Subproject commit 00d7063cdca8d39eb4e3308277cc21eae7bb44f7 +Subproject commit 680d97abfb84be1d6c8cd61c5523fe70b82fa3bb diff --git a/.gitmodules b/.gitmodules index d2a6c36d..9ce27c3c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -186,3 +186,6 @@ [submodule "vim-vsnip"] path = .config/nvim/pack/plugins/opt/vim-vsnip url = https://github.com/hrsh7th/vim-vsnip +[submodule "fidget.nvim"] + path = .config/nvim/pack/plugins/opt/fidget.nvim + url = https://github.com/j-hui/fidget.nvim