diff --git a/configuration.nix b/configuration.nix index d9a59141..d3663861 100644 --- a/configuration.nix +++ b/configuration.nix @@ -109,6 +109,7 @@ isMaximal: { twig.enable = false; gettext.enable = false; fluent.enable = false; + jq.enable = false; # Nim LSP is broken on Darwin and therefore # should be disabled by default. Users may still enable diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md index 7a4bcce5..361c48aa 100644 --- a/docs/manual/release-notes/rl-0.9.md +++ b/docs/manual/release-notes/rl-0.9.md @@ -283,6 +283,8 @@ - Added `languages.tex`. Currently only highlighting, formatting and lsp. No previewing yet. +- Added `languages.jq`. Supports highlighting, formatting and lsp. + - Didn't Add [`syntax-gaslighting`](https://github.com/NotAShelf/syntax-gaslighting.nvim), you're crazy. diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix index 88061e99..e5f00f58 100644 --- a/modules/plugins/languages/default.nix +++ b/modules/plugins/languages/default.nix @@ -63,6 +63,7 @@ in { ./gettext.nix ./fluent.nix ./openscad.nix + ./jq.nix # This is now a hard deprecation. (mkRenamedOptionModule ["vim" "languages" "enableLSP"] ["vim" "lsp" "enable"]) diff --git a/modules/plugins/languages/jq.nix b/modules/plugins/languages/jq.nix new file mode 100644 index 00000000..149dc5b2 --- /dev/null +++ b/modules/plugins/languages/jq.nix @@ -0,0 +1,114 @@ +{ + config, + lib, + pkgs, + ... +}: let + inherit (builtins) attrNames; + inherit (lib.options) literalExpression mkEnableOption mkOption; + inherit (lib.modules) mkIf mkMerge; + inherit (lib.meta) getExe; + inherit (lib.types) enum listOf; + inherit (lib.nvim.attrsets) mapListToAttrs; + inherit (lib.nvim.types) mkGrammarOption; + + cfg = config.vim.languages.jq; + + defaultServers = ["jq-lsp"]; + servers = { + jq-lsp = { + enable = true; + cmd = [(getExe pkgs.jq-lsp)]; + filetypes = ["jq"]; + root_markers = [".git"]; + }; + }; + + defaultFormat = ["jqfmt"]; + formats = { + jqfmt = { + command = getExe pkgs.jqfmt; + args = [ + "-ob" + "-ar" + "-op=pipe" + ]; + }; + }; +in { + options.vim.languages.jq = { + enable = mkEnableOption "JQ support"; + + treesitter = { + enable = + mkEnableOption "JQ treesitter" + // { + default = config.vim.languages.enableTreesitter; + defaultText = literalExpression "config.vim.languages.enableTreesitter"; + }; + package = mkGrammarOption pkgs "jq"; + }; + + lsp = { + enable = + mkEnableOption "JQ LSP support" + // { + default = config.vim.lsp.enable; + defaultText = literalExpression "config.vim.lsp.enable"; + }; + servers = mkOption { + type = listOf (enum (attrNames servers)); + default = defaultServers; + description = "JQ LSP server to use"; + }; + }; + + format = { + enable = + mkEnableOption "JQ formatting" + // { + default = config.vim.languages.enableFormat; + defaultText = literalExpression "config.vim.languages.enableFormat"; + }; + + type = mkOption { + description = "JQ formatter to use"; + type = listOf (enum (attrNames formats)); + default = defaultFormat; + }; + }; + }; + + config = mkIf cfg.enable (mkMerge [ + (mkIf cfg.treesitter.enable { + vim.treesitter = { + enable = true; + grammars = [cfg.treesitter.package]; + }; + }) + + (mkIf cfg.lsp.enable { + vim.lsp.servers = + mapListToAttrs (n: { + name = n; + value = servers.${n}; + }) + cfg.lsp.servers; + }) + + (mkIf cfg.format.enable { + vim.formatter.conform-nvim = { + enable = true; + setupOpts = { + formatters_by_ft.jq = cfg.format.type; + formatters = + mapListToAttrs (name: { + inherit name; + value = formats.${name}; + }) + cfg.format.type; + }; + }; + }) + ]); +}