From 1869f462ae6e302623701d37c67ded6eeb56726d Mon Sep 17 00:00:00 2001 From: Ching Pei Yang Date: Sat, 23 Aug 2025 15:17:12 +0200 Subject: [PATCH] language/astro: remove broken format option --- modules/plugins/languages/astro.nix | 44 +---------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/modules/plugins/languages/astro.nix b/modules/plugins/languages/astro.nix index a16f286e..4669e3c6 100644 --- a/modules/plugins/languages/astro.nix +++ b/modules/plugins/languages/astro.nix @@ -8,7 +8,7 @@ inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; - inherit (lib.types) enum package; + inherit (lib.types) enum; inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.nvim.types) mkGrammarOption diagnostics singleOrListOf; inherit (lib.generators) mkLuaInline; @@ -40,22 +40,6 @@ }; }; - # TODO: specify packages - defaultFormat = "prettier"; - formats = { - prettier = { - package = pkgs.prettier; - }; - - prettierd = { - package = pkgs.prettierd; - }; - - biome = { - package = pkgs.biome; - }; - }; - # TODO: specify packages defaultDiagnosticsProvider = ["eslint_d"]; diagnosticsProviders = { @@ -95,22 +79,6 @@ in { }; }; - format = { - enable = mkEnableOption "Astro formatting" // {default = config.vim.languages.enableFormat;}; - - type = mkOption { - type = enum (attrNames formats); - default = defaultFormat; - description = "Astro formatter to use"; - }; - - package = mkOption { - type = package; - default = formats.${cfg.format.type}.package; - description = "Astro formatter package"; - }; - }; - extraDiagnostics = { enable = mkEnableOption "extra Astro diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;}; @@ -137,16 +105,6 @@ in { cfg.lsp.servers; }) - (mkIf cfg.format.enable { - vim.formatter.conform-nvim = { - enable = true; - setupOpts.formatters_by_ft.astro = [cfg.format.type]; - setupOpts.formatters.${cfg.format.type} = { - command = getExe cfg.format.package; - }; - }; - }) - (mkIf cfg.extraDiagnostics.enable { vim.diagnostics.nvim-lint = { enable = true;