diff --git a/configuration.nix b/configuration.nix index 9155d427..5cabc67b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -104,6 +104,7 @@ isMaximal: { qml.enable = false; jinja.enable = false; svelte.enable = false; + vue.enable = false; liquid.enable = false; tera.enable = false; twig.enable = false; diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md index f2889bb8..04ba7acd 100644 --- a/docs/manual/release-notes/rl-0.9.md +++ b/docs/manual/release-notes/rl-0.9.md @@ -361,6 +361,8 @@ - Added [`biomejs`](https://biomejs.dev/) as extra diagnostics provider to `languages.ts`. +- Added `languages.vue`. + - Add `languages.fluent` using the official plugin. This only provides highlighting. diff --git a/lib/types/lsp.nix b/lib/types/lsp.nix index 2efbd229..d05b8783 100644 --- a/lib/types/lsp.nix +++ b/lib/types/lsp.nix @@ -4,8 +4,7 @@ mkLspPresetEnableOption = option: display: fileTypes: mkEnableOption '' the ${display} Language Server. - - Default `filetypes = ${lib.generators.toPretty {} fileTypes}`. \ + Default `filetypes = ${lib.generators.toPretty {} fileTypes}`. Use {option}`vim.lsp.servers.${option}` for customization ''; in { diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix index f85c9701..97149614 100644 --- a/modules/plugins/languages/default.nix +++ b/modules/plugins/languages/default.nix @@ -45,6 +45,7 @@ in { ./scala.nix ./sql.nix ./svelte.nix + ./vue.nix ./terraform.nix ./toml.nix ./typescript.nix diff --git a/modules/plugins/languages/vue.nix b/modules/plugins/languages/vue.nix new file mode 100644 index 00000000..9dc0d803 --- /dev/null +++ b/modules/plugins/languages/vue.nix @@ -0,0 +1,151 @@ +{ + config, + pkgs, + lib, + ... +}: let + inherit (builtins) attrNames; + inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.modules) mkIf mkMerge; + inherit (lib) genAttrs; + inherit (lib.meta) getExe; + inherit (lib.types) enum listOf; + inherit (lib.nvim.types) mkGrammarOption diagnostics; + inherit (lib.nvim.attrsets) mapListToAttrs; + + cfg = config.vim.languages.vue; + + defaultServers = ["vue-language-server" "vtsls"]; + servers = ["vue-language-server" "vtsls" "typescript-language-server"]; + + defaultFormat = ["biome" "biome-check" "biome-organize-imports"]; + formats = { + biome = { + command = getExe pkgs.biome; + }; + + biome-check = { + command = getExe pkgs.biome; + }; + + biome-organize-imports = { + command = getExe pkgs.biome; + }; + }; + + defaultDiagnosticsProvider = ["biomejs"]; + diagnosticsProviders = { + biomejs = let + pkg = pkgs.biome; + in { + package = pkg; + config = { + cmd = getExe pkg; + }; + }; + }; +in { + options.vim.languages.vue = { + enable = mkEnableOption "Vue.js language support"; + + treesitter = { + enable = + mkEnableOption "Vue.js treesitter" + // { + default = config.vim.languages.enableTreesitter; + defaultText = literalExpression "config.vim.languages.enableTreesitter"; + }; + + package = mkGrammarOption pkgs "vue"; + }; + + lsp = { + enable = + mkEnableOption "Vue.js LSP support" + // { + default = config.vim.lsp.enable; + defaultText = literalExpression "config.vim.lsp.enable"; + }; + + servers = mkOption { + type = listOf (enum servers); + default = defaultServers; + description = "Vue.js LSP server to use"; + }; + }; + + format = { + enable = + mkEnableOption "Vue.js formatting" + // { + default = config.vim.languages.enableFormat; + defaultText = literalExpression "config.vim.languages.enableFormat"; + }; + + type = mkOption { + type = listOf (enum (attrNames formats)); + default = defaultFormat; + description = "Vue.js formatter to use."; + }; + }; + + extraDiagnostics = { + enable = + mkEnableOption "extra Vue.js diagnostics" + // { + default = config.vim.languages.enableExtraDiagnostics; + defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics"; + }; + + types = diagnostics { + langDesc = "Vue.js"; + inherit diagnosticsProviders; + inherit defaultDiagnosticsProvider; + }; + }; + }; + + config = mkIf cfg.enable (mkMerge [ + (mkIf cfg.treesitter.enable { + 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 = ["vue"]; + }); + }; + }) + + (mkIf cfg.format.enable { + vim.formatter.conform-nvim = { + enable = true; + setupOpts = { + formatters_by_ft.vue = cfg.format.type; + formatters = + mapListToAttrs (name: { + inherit name; + value = formats.${name}; + }) + cfg.format.type; + }; + }; + }) + + (mkIf cfg.extraDiagnostics.enable { + vim.diagnostics.nvim-lint = { + enable = true; + linters_by_ft.vue = cfg.extraDiagnostics.types; + linters = mkMerge ( + map (name: { + ${name}.cmd = getExe diagnosticsProviders.${name}.package; + }) + cfg.extraDiagnostics.types + ); + }; + }) + ]); +}