NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-03-15 21:26:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

language/json: add json5 support

Browse source
This commit is contained in:
Snoweuph 2026-03-06 16:43:56 +01:00
commit 09e1dd2843
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/plugins/languages/json.nix
View file

@ -18,7 +18,7 @@
servers = {
jsonls = {
cmd = [(getExe' pkgs.vscode-langservers-extracted "vscode-json-language-server") "--stdio"];
filetypes = ["json" "jsonc"];
filetypes = ["json" "jsonc" "json5"];
init_options = {provideFormatter = true;};
root_markers = [".git"];
};
@ -39,7 +39,8 @@ in {
treesitter = {
enable = mkEnableOption "JSON treesitter" // {default = config.vim.languages.enableTreesitter;};
package = mkGrammarOption pkgs "json";
jsonPackage = mkGrammarOption pkgs "json";
json5Package = mkGrammarOption pkgs "json5";
};
lsp = {
@ -66,7 +67,10 @@ in {
config = mkIf cfg.enable (mkMerge [
(mkIf cfg.treesitter.enable {
vim.treesitter.enable = true;
vim.treesitter.grammars = [cfg.treesitter.package];
vim.treesitter.grammars = [
cfg.treesitter.jsonPackage
cfg.treesitter.json5Package
];
})
(mkIf cfg.lsp.enable {
@ -83,6 +87,7 @@ in {
enable = true;
setupOpts = {
formatters_by_ft.json = cfg.format.type;
formatters_by_ft.json5 = cfg.format.type;
formatters =
mapListToAttrs (name: {
inherit name;