From 6c88501b3042b3f2cf67b80040ad77f7d4f77d21 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 30 Jan 2026 12:19:46 +0100 Subject: [PATCH] Add tailwind lsp --- modules/cli/zsh/default.nix | 3 ++- nvim/after/lsp/basedpyright.lua | 1 + nvim/after/lsp/bashls.lua | 1 + nvim/after/lsp/biome.lua | 1 + nvim/after/lsp/jsonls.lua | 1 + nvim/after/lsp/sqls.lua | 1 + nvim/after/lsp/tailwindcss.lua | 21 +++++++++++++++++++++ nvim/after/lsp/ts_ls.lua | 3 ++- 8 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 nvim/after/lsp/tailwindcss.lua diff --git a/modules/cli/zsh/default.nix b/modules/cli/zsh/default.nix index 19f8317..5363ab0 100644 --- a/modules/cli/zsh/default.nix +++ b/modules/cli/zsh/default.nix @@ -51,6 +51,7 @@ jn = "jj new"; jnt = "jj new 'trunk()'"; jc = "jj commit"; + jd = "jj desc"; jcm = "jj commit -m"; je = "jj edit"; jb = "jj bookmark"; @@ -58,7 +59,7 @@ jf = "jj git fetch"; jl = "jj log"; jla = "jj log -r 'all()'"; - jd = "jj diff"; + jdf = "jj diff"; jcl = "jj git clone --colocate"; jrb = "jj rebase"; jrbt = "jj rebase -o 'trunk()'"; diff --git a/nvim/after/lsp/basedpyright.lua b/nvim/after/lsp/basedpyright.lua index a540c59..c0d697a 100644 --- a/nvim/after/lsp/basedpyright.lua +++ b/nvim/after/lsp/basedpyright.lua @@ -1,3 +1,4 @@ +---@type vim.lsp.Config return { settings = { basedpyright = { diff --git a/nvim/after/lsp/bashls.lua b/nvim/after/lsp/bashls.lua index 30fac2a..b31384b 100644 --- a/nvim/after/lsp/bashls.lua +++ b/nvim/after/lsp/bashls.lua @@ -1,3 +1,4 @@ +---@type vim.lsp.Config return { filetypes = { "sh", "zsh", "make" }, } diff --git a/nvim/after/lsp/biome.lua b/nvim/after/lsp/biome.lua index 827deae..36a3b36 100644 --- a/nvim/after/lsp/biome.lua +++ b/nvim/after/lsp/biome.lua @@ -8,6 +8,7 @@ vim.api.nvim_create_autocmd('LspAttach', { end, }) +---@type vim.lsp.Config return { -- Disable lunching from node_modules (no nix binary) cmd = { "biome", "lsp-proxy" }, diff --git a/nvim/after/lsp/jsonls.lua b/nvim/after/lsp/jsonls.lua index b874e56..ef10848 100644 --- a/nvim/after/lsp/jsonls.lua +++ b/nvim/after/lsp/jsonls.lua @@ -1,3 +1,4 @@ +---@type vim.lsp.Config return { settings = { json = { diff --git a/nvim/after/lsp/sqls.lua b/nvim/after/lsp/sqls.lua index 087999c..022b078 100644 --- a/nvim/after/lsp/sqls.lua +++ b/nvim/after/lsp/sqls.lua @@ -1,3 +1,4 @@ +---@type vim.lsp.Config return { settings = { sqls = { diff --git a/nvim/after/lsp/tailwindcss.lua b/nvim/after/lsp/tailwindcss.lua new file mode 100644 index 0000000..a5876b0 --- /dev/null +++ b/nvim/after/lsp/tailwindcss.lua @@ -0,0 +1,21 @@ +---@type vim.lsp.Config +return { + settings = { + tailwindCSS = { + classAttributes = { + "class", + "className", + "class:list", + "classList", + "ngClass", + ".+ClassName" + }, + classFunctions = { + "tw", + "clsx", + "tw\\.[a-z-]+", + "cn" + } + }, + }, +} diff --git a/nvim/after/lsp/ts_ls.lua b/nvim/after/lsp/ts_ls.lua index 7d28d9f..a2d57ff 100644 --- a/nvim/after/lsp/ts_ls.lua +++ b/nvim/after/lsp/ts_ls.lua @@ -1,11 +1,12 @@ -- use biome for formatting +---@type vim.lsp.Config return { ---@param client vim.lsp.Client on_init = function(client, _) if client.server_capabilities then client.server_capabilities["documentFormattingProvider"] = false client.server_capabilities["documentRangeFormattingProvider"] = false - client.server_capabilities["documentOnTypeFormattingProvider"] = false + client.server_capabilities["documentOnTypeFormattingProvider"] = nil end end, }