diff --git a/configuration.nix b/configuration.nix index 08c4b1c1..33b9f119 100644 --- a/configuration.nix +++ b/configuration.nix @@ -103,7 +103,6 @@ isMaximal: { make.enable = false; qml.enable = false; jinja.enable = false; - tailwind.enable = false; svelte.enable = false; liquid.enable = false; tera.enable = false; diff --git a/docs/manual/configuring/languages.md b/docs/manual/configuring/languages.md index f956a0e3..9a82fc1e 100644 --- a/docs/manual/configuring/languages.md +++ b/docs/manual/configuring/languages.md @@ -75,8 +75,6 @@ languages have sections under the `vim.languages` attribute. [vim.languages.scala.enable](./options.html#option-vim-languages-scala-enable) - Svelte: [vim.languages.svelte.enable](./options.html#option-vim-languages-svelte-enable) -- Tailwind: - [vim.languages.tailwind.enable](./options.html#option-vim-languages-tailwind-enable) - Terraform: [vim.languages.terraform.enable](./options.html#option-vim-languages-terraform-enable) - Typst: diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md index 4c42742c..5a0f5eee 100644 --- a/docs/manual/release-notes/rl-0.9.md +++ b/docs/manual/release-notes/rl-0.9.md @@ -81,6 +81,9 @@ - Renamed `tofuls-tf` and `tofuls-hcl` to `tofu-ls`. +- Removed `languages.tailwind` which only provided an LSP. Use + `lsp.presets.tailwindcss-language-server` instead. + ## Changelog {#sec-release-0-9-changelog} [SecBear](https://github.com/SecBear): diff --git a/modules/extra/deprecations.nix b/modules/extra/deprecations.nix index 1572f249..39c4b96c 100644 --- a/modules/extra/deprecations.nix +++ b/modules/extra/deprecations.nix @@ -242,9 +242,6 @@ in { (mkRenamedLspServer "svelte") (mkRemovedLspPackage "svelte") - (mkRenamedLspServer "tailwind") - (mkRemovedLspPackage "tailwind") - (mkRemovedLspPackage "terraform") (mkRenamedLspServer "ts") diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix index 3f779dbb..16db0aab 100644 --- a/modules/plugins/languages/default.nix +++ b/modules/plugins/languages/default.nix @@ -45,7 +45,6 @@ in { ./scala.nix ./sql.nix ./svelte.nix - ./tailwind.nix ./terraform.nix ./toml.nix ./ts.nix diff --git a/modules/plugins/languages/tailwind.nix b/modules/plugins/languages/tailwind.nix deleted file mode 100644 index f166980b..00000000 --- a/modules/plugins/languages/tailwind.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: let - inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; - inherit (lib.modules) mkIf mkMerge; - inherit (lib.meta) getExe; - inherit (lib.types) enum; - inherit (lib.nvim.attrsets) mapListToAttrs; - inherit (lib.nvim.types) deprecatedSingleOrListOf; - inherit (lib.generators) mkLuaInline; - - cfg = config.vim.languages.tailwind; - - defaultServers = ["tailwindcss"]; - servers = { - tailwindcss = { - enable = true; - cmd = [(getExe pkgs.tailwindcss-language-server) "--stdio"]; - before_init = mkLuaInline '' - function(_, config) - if not config.settings then - config.settings = {} - end - if not config.settings.editor then - config.settings.editor = {} - end - if not config.settings.editor.tabSize then - config.settings.editor.tabSize = vim.lsp.util.get_effective_tabstop() - end - end - ''; - workspace_required = true; - root_dir = mkLuaInline '' - function(bufnr, on_dir) - local root_files = { - -- Generic - 'tailwind.config.js', - 'tailwind.config.cjs', - 'tailwind.config.mjs', - 'tailwind.config.ts', - 'postcss.config.js', - 'postcss.config.cjs', - 'postcss.config.mjs', - 'postcss.config.ts', - -- Django - 'theme/static_src/tailwind.config.js', - 'theme/static_src/tailwind.config.cjs', - 'theme/static_src/tailwind.config.mjs', - 'theme/static_src/tailwind.config.ts', - 'theme/static_src/postcss.config.js', - } - local fname = vim.api.nvim_buf_get_name(bufnr) - root_files = util.insert_package_json(root_files, 'tailwindcss', fname) - root_files = util.root_markers_with_field(root_files, { 'mix.lock', 'Gemfile.lock' }, 'tailwind', fname) - on_dir(vim.fs.dirname(vim.fs.find(root_files, { path = fname, upward = true })[1])) - end - ''; - }; - }; -in { - options.vim.languages.tailwind = { - enable = mkEnableOption "Tailwindcss language support"; - - lsp = { - enable = - mkEnableOption "Tailwindcss LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; - - servers = mkOption { - type = deprecatedSingleOrListOf "vim.language.tailwind.lsp.servers" (enum (attrNames servers)); - default = defaultServers; - description = "Tailwindcss LSP server to use"; - }; - }; - }; - - config = mkIf cfg.enable (mkMerge [ - (mkIf cfg.lsp.enable { - vim.lsp.servers = - mapListToAttrs (n: { - name = n; - value = servers.${n}; - }) - cfg.lsp.servers; - }) - ]); -}