From b49402bccd27ebbaa93ce924f94a8893dfc46ed8 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Thu, 3 Apr 2025 07:36:46 +0300 Subject: [PATCH] languages/astro: fix syntax issue in inline Lua; add prettierd --- modules/plugins/languages/astro.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/plugins/languages/astro.nix b/modules/plugins/languages/astro.nix index e1a56172..9c359a2e 100644 --- a/modules/plugins/languages/astro.nix +++ b/modules/plugins/languages/astro.nix @@ -22,7 +22,7 @@ package = pkgs.astro-language-server; lspConfig = '' lspconfig.astro.setup { - capabilities = capabilities; + capabilities = capabilities, on_attach = attach_keymaps, cmd = ${ if isList cfg.lsp.package @@ -41,6 +41,10 @@ package = pkgs.nodePackages.prettier; }; + prettierd = { + package = pkgs.prettierd; + }; + biome = { package = pkgs.biome; }; @@ -84,16 +88,16 @@ in { enable = mkEnableOption "Astro LSP support" // {default = config.vim.languages.enableLSP;}; server = mkOption { - description = "Astro LSP server to use"; type = enum (attrNames servers); default = defaultServer; + description = "Astro LSP server to use"; }; package = mkOption { - description = "Astro LSP server package, or the command to run as a list of strings"; - example = ''[lib.getExe pkgs.astro-language-server "--minify" "--stdio"]''; type = either package (listOf str); default = servers.${cfg.lsp.server}.package; + example = ''[lib.getExe pkgs.astro-language-server "--minify" "--stdio"]''; + description = "Astro LSP server package, or the command to run as a list of strings"; }; };