From aad9b59d3c62aa7f2fbf76f440c9344d4a7e7440 Mon Sep 17 00:00:00 2001
From: Valyn Tyler <115489989+ValynTyler@users.noreply.github.com>
Date: Wed, 19 Nov 2025 21:17:21 +0100
Subject: [PATCH 1/5] feat: add emmet-ls to 'css.lsp.servers'

---
 modules/plugins/languages/css.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/plugins/languages/css.nix b/modules/plugins/languages/css.nix
index 28e94151..aa85af8a 100644
--- a/modules/plugins/languages/css.nix
+++ b/modules/plugins/languages/css.nix
@@ -28,6 +28,11 @@
         less.validate = true;
       };
     };
+    emmet-ls = {
+      cmd = [(getExe pkgs.emmet-ls) "--stdio"];
+      filetypes = ["css" "scss" "less"];
+      root_markers = [".git" "package.json"];
+    };
   };
 
   defaultFormat = ["prettier"];

From 75a8fdefce0ae0e710ec98f4bee25816140c9da5 Mon Sep 17 00:00:00 2001
From: Valyn Tyler <115489989+ValynTyler@users.noreply.github.com>
Date: Wed, 19 Nov 2025 21:20:22 +0100
Subject: [PATCH 2/5] feat: add emmet-ls to `ts.lsp.servers`

---
 modules/plugins/languages/ts.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix
index 72ff9930..d5fb70ea 100644
--- a/modules/plugins/languages/ts.nix
+++ b/modules/plugins/languages/ts.nix
@@ -73,6 +73,19 @@
     # redirect the user to the correct server.
     tsserver = ts_ls;
 
+    emmet-ls = {
+      cmd = [(getExe pkgs.emmet-ls) "--stdio"];
+      root_markers = ["tsconfig.json" "jsconfig.json" "package.json" ".git"];
+      filetypes = [
+        "javascript"
+        "javascriptreact"
+        "javascript.jsx"
+        "typescript"
+        "typescriptreact"
+        "typescript.tsx"
+      ];
+    };
+
     denols = {
       cmd = [(getExe pkgs.deno) "lsp"];
       cmd_env = {NO_COLOR = true;};

From 2f1afd4add4cb18110abf133ebaf5e616b93e1b2 Mon Sep 17 00:00:00 2001
From: Valyn Tyler <115489989+ValynTyler@users.noreply.github.com>
Date: Wed, 19 Nov 2025 21:21:10 +0100
Subject: [PATCH 3/5] feat: add emmet-ls to html default servers

---
 modules/plugins/languages/html.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugins/languages/html.nix b/modules/plugins/languages/html.nix
index 85918ad2..89b2ab55 100644
--- a/modules/plugins/languages/html.nix
+++ b/modules/plugins/languages/html.nix
@@ -16,7 +16,7 @@
 
   cfg = config.vim.languages.html;
 
-  defaultServers = ["superhtml"];
+  defaultServers = ["superhtml" "emmet-ls"];
   servers = {
     superhtml = {
       cmd = [(getExe pkgs.superhtml) "lsp"];

From 84a22717c0f3262d6fc9713cfe5e66c23837e74e Mon Sep 17 00:00:00 2001
From: Valyn Tyler <115489989+ValynTyler@users.noreply.github.com>
Date: Wed, 19 Nov 2025 21:21:18 +0100
Subject: [PATCH 4/5] chore: update release-notes

---
 docs/release-notes/rl-0.8.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index a3ec46e0..ec19ca5f 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -597,3 +597,5 @@
 [emmet-ls]: https://github.com/aca/emmet-ls
 
 - Add [emmet-ls] to `html.lsp.servers`
+- Add [emmet-ls] to `css.lsp.servers`
+- Add [emmet-ls] to `ts.lsp.servers`

From bd21192441040a040f1b67cab37d1e54016f9ce2 Mon Sep 17 00:00:00 2001
From: Valyn Tyler <115489989+ValynTyler@users.noreply.github.com>
Date: Wed, 19 Nov 2025 21:24:41 +0100
Subject: [PATCH 5/5] chore: update release-notes

---
 docs/release-notes/rl-0.8.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index ec19ca5f..104813c6 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -599,3 +599,4 @@
 - Add [emmet-ls] to `html.lsp.servers`
 - Add [emmet-ls] to `css.lsp.servers`
 - Add [emmet-ls] to `ts.lsp.servers`
+- Add [emmet-ls] to html default servers