From 8da8accdf4e2893fb4da1419360b539e308ae759 Mon Sep 17 00:00:00 2001
From: alfarel <alfarelcynthesis@proton.me>
Date: Sat, 26 Jul 2025 22:58:37 -0400
Subject: [PATCH 1/2] fix(languages/yaml): use mkLuaInline for on_attach

---
 modules/plugins/languages/yaml.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/plugins/languages/yaml.nix b/modules/plugins/languages/yaml.nix
index 1869b1c1..8a74fa9d 100644
--- a/modules/plugins/languages/yaml.nix
+++ b/modules/plugins/languages/yaml.nix
@@ -5,6 +5,7 @@
   ...
 }: let
   inherit (builtins) attrNames;
+  inherit (lib.generators) mkLuaInline;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
@@ -14,16 +15,17 @@
 
   cfg = config.vim.languages.yaml;
 
-  onAttach =
-    if config.vim.languages.helm.lsp.enable
+  on_attach = mkLuaInline (
+    if config.vim.languages.helm.lsp.enable && config.vim.languages.helm.enable
     then ''
-      on_attach = function(client, bufnr)
+      function(client, bufnr)
         local filetype = vim.bo[bufnr].filetype
         if filetype == "helm" then
           client.stop()
         end
       end''
-    else "on_attach = default_on_attach";
+    else "default_on_attach"
+  );
 
   defaultServers = ["yaml-language-server"];
   servers = {
@@ -32,7 +34,7 @@
       cmd = [(getExe pkgs.yaml-language-server) "--stdio"];
       filetypes = ["yaml" "yaml.docker-compose" "yaml.gitlab" "yaml.helm-values"];
       root_markers = [".git"];
-      on_attach = onAttach;
+      inherit on_attach;
       # -- https://github.com/redhat-developer/vscode-redhat-telemetry#how-to-disable-telemetry-reporting
       settings = {
         redhat = {

From 9e31b131a724215a9dc7cdf8bd066eaa0d33768d Mon Sep 17 00:00:00 2001
From: alfarel <alfarelcynthesis@proton.me>
Date: Sun, 27 Jul 2025 08:22:38 -0400
Subject: [PATCH 2/2] fix(languages/helm): source likely-valid yamlls path

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

diff --git a/modules/plugins/languages/helm.nix b/modules/plugins/languages/helm.nix
index 1971eb31..97d450a0 100644
--- a/modules/plugins/languages/helm.nix
+++ b/modules/plugins/languages/helm.nix
@@ -31,7 +31,7 @@
         helm-ls = {
           yamlls = {
             # TODO: Determine if this is a good enough solution
-            path = (head yamlCfg.lsp.servers).cmd;
+            path = config.vim.lsp.servers.${head yamlCfg.lsp.servers}.cmd;
           };
         };
       };