mirror of
https://github.com/NotAShelf/nvf.git
synced 2026-04-27 20:05:23 +00:00
languages/tailwind: remove module
This commit is contained in:
parent
0bffd83d43
commit
f5c13c7d39
6 changed files with 3 additions and 101 deletions
|
|
@ -103,7 +103,6 @@ isMaximal: {
|
||||||
make.enable = false;
|
make.enable = false;
|
||||||
qml.enable = false;
|
qml.enable = false;
|
||||||
jinja.enable = false;
|
jinja.enable = false;
|
||||||
tailwind.enable = false;
|
|
||||||
svelte.enable = false;
|
svelte.enable = false;
|
||||||
liquid.enable = false;
|
liquid.enable = false;
|
||||||
tera.enable = false;
|
tera.enable = false;
|
||||||
|
|
|
||||||
|
|
@ -75,8 +75,6 @@ languages have sections under the `vim.languages` attribute.
|
||||||
[vim.languages.scala.enable](./options.html#option-vim-languages-scala-enable)
|
[vim.languages.scala.enable](./options.html#option-vim-languages-scala-enable)
|
||||||
- Svelte:
|
- Svelte:
|
||||||
[vim.languages.svelte.enable](./options.html#option-vim-languages-svelte-enable)
|
[vim.languages.svelte.enable](./options.html#option-vim-languages-svelte-enable)
|
||||||
- Tailwind:
|
|
||||||
[vim.languages.tailwind.enable](./options.html#option-vim-languages-tailwind-enable)
|
|
||||||
- Terraform:
|
- Terraform:
|
||||||
[vim.languages.terraform.enable](./options.html#option-vim-languages-terraform-enable)
|
[vim.languages.terraform.enable](./options.html#option-vim-languages-terraform-enable)
|
||||||
- Typst:
|
- Typst:
|
||||||
|
|
|
||||||
|
|
@ -81,6 +81,9 @@
|
||||||
|
|
||||||
- Renamed `tofuls-tf` and `tofuls-hcl` to `tofu-ls`.
|
- 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}
|
## Changelog {#sec-release-0-9-changelog}
|
||||||
|
|
||||||
[SecBear](https://github.com/SecBear):
|
[SecBear](https://github.com/SecBear):
|
||||||
|
|
|
||||||
|
|
@ -242,9 +242,6 @@ in {
|
||||||
(mkRenamedLspServer "svelte")
|
(mkRenamedLspServer "svelte")
|
||||||
(mkRemovedLspPackage "svelte")
|
(mkRemovedLspPackage "svelte")
|
||||||
|
|
||||||
(mkRenamedLspServer "tailwind")
|
|
||||||
(mkRemovedLspPackage "tailwind")
|
|
||||||
|
|
||||||
(mkRemovedLspPackage "terraform")
|
(mkRemovedLspPackage "terraform")
|
||||||
|
|
||||||
(mkRenamedLspServer "ts")
|
(mkRenamedLspServer "ts")
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,6 @@ in {
|
||||||
./scala.nix
|
./scala.nix
|
||||||
./sql.nix
|
./sql.nix
|
||||||
./svelte.nix
|
./svelte.nix
|
||||||
./tailwind.nix
|
|
||||||
./terraform.nix
|
./terraform.nix
|
||||||
./toml.nix
|
./toml.nix
|
||||||
./ts.nix
|
./ts.nix
|
||||||
|
|
|
||||||
|
|
@ -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;
|
|
||||||
})
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue