NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-04-27 11:55:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into fix-treesitter-max-lines

Browse source
This commit is contained in:
raf 2026-04-17 11:12:49 +03:00 • committed by GitHub
commit b732371274
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 69 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/plugins/languages/astro.nix
View file

@ -17,7 +17,7 @@
cfg = config.vim.languages.astro;
defaultServers = ["astro-language-server"];
servers = ["astro-language-server"];
servers = ["astro-language-server" "emmet-ls"];
defaultFormat = ["prettier"];
formats = let

2
modules/plugins/languages/jinja.nix
View file

@ -13,7 +13,7 @@
cfg = config.vim.languages.jinja;
defaultServers = ["jinja-lsp"];
servers = ["jinja-lsp"];
servers = ["jinja-lsp" "emmet-ls"];
in {
options.vim.languages.jinja = {
enable = mkEnableOption "Jinja template language support";

31
modules/plugins/languages/liquid.nix
View file

@ -4,11 +4,16 @@
lib,
...
}: let
inherit (lib.options) mkEnableOption literalExpression;
inherit (lib) genAttrs;
inherit (lib.options) mkEnableOption literalExpression mkOption;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption;
cfg = config.vim.languages.liquid;
defaultServers = [];
servers = ["emmet-ls"];
in {
options.vim.languages.liquid = {
enable = mkEnableOption "Liquid templating language support";
@ -22,6 +27,21 @@ in {
};
package = mkGrammarOption pkgs "liquid";
};
lsp = {
enable =
mkEnableOption "Liquid LSP support"
// {
default = config.vim.lsp.enable;
defaultText = literalExpression "config.vim.lsp.enable";
};
servers = mkOption {
description = "Liquid LSP server to use";
type = listOf (enum servers);
default = defaultServers;
};
};
# TODO: if curlylint gets packaged for nix, add it.
};
@ -30,5 +50,14 @@ in {
vim.treesitter.enable = true;
vim.treesitter.grammars = [cfg.treesitter.package];
})
(mkIf cfg.lsp.enable {
vim.lsp = {
presets = genAttrs cfg.lsp.servers (_: {enable = true;});
servers = genAttrs cfg.lsp.servers (_: {
filetypes = ["liquid"];
});
};
})
]);
}

30
modules/plugins/languages/tera.nix
View file

@ -4,11 +4,16 @@
lib,
...
}: let
inherit (lib.options) mkEnableOption literalExpression;
inherit (lib) genAttrs;
inherit (lib.options) mkEnableOption literalExpression mkOption;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption;
cfg = config.vim.languages.tera;
defaultServers = [];
servers = ["emmet-ls"];
in {
options.vim.languages.tera = {
enable = mkEnableOption "Tera templating language support";
@ -22,6 +27,20 @@ in {
};
package = mkGrammarOption pkgs "tera";
};
lsp = {
enable =
mkEnableOption "Tera LSP support"
// {
default = config.vim.lsp.enable;
defaultText = literalExpression "config.vim.lsp.enable";
};
servers = mkOption {
description = "Tera LSP server to use";
type = listOf (enum servers);
default = defaultServers;
};
};
};
config = mkIf cfg.enable (mkMerge [
@ -29,5 +48,14 @@ in {
vim.treesitter.enable = true;
vim.treesitter.grammars = [cfg.treesitter.package];
})
(mkIf cfg.lsp.enable {
vim.lsp = {
presets = genAttrs cfg.lsp.servers (_: {enable = true;});
servers = genAttrs cfg.lsp.servers (_: {
filetypes = ["tera"];
});
};
})
]);
}

2
modules/plugins/languages/twig.nix
View file

@ -16,7 +16,7 @@
cfg = config.vim.languages.twig;
defaultServers = ["twig-language-server"];
servers = ["twig-language-server"];
servers = ["twig-language-server" "emmet-ls"];
defaultFormat = ["djlint"];
formats = {