From 7b092e877418410cf941a1bab152769c1b27d1e1 Mon Sep 17 00:00:00 2001
From: Fred Drake <fred.drake@gmail.com>
Date: Mon, 10 Feb 2025 16:10:00 -0500
Subject: [PATCH] Adjustments due to upstream API changes

---
 README.md                      | 4 ++--
 config/debugging.nix           | 8 +++-----
 config/golang/debugging.nix    | 8 +++-----
 config/iac/language.nix        | 4 ++--
 config/javascript/language.nix | 2 +-
 config/python/debugging.nix    | 2 +-
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index d91835f..30a7ec9 100644
--- a/README.md
+++ b/README.md
@@ -80,6 +80,6 @@ And add it to your home-manager imports:
 | Node       | prettier     | tsserver                           | vscode-js-debug | javascript        |
 | Ansible    | yamlfmt      | ansiblels                          |                 | iac               |
 | Terraform  | tofu_fmt     | terraformls                        |                 | iac               |
-| Nginx      |              | nginx-language-server              |                 | iac               |
-| Helm       |              | helm-ls                            |                 | iac               |
+| Nginx      |              | nginx_language_server              |                 | iac               |
+| Helm       |              | helm_ls                            |                 | iac               |
 | Dockerfile |              | dockerls                           |                 | iac               |
diff --git a/config/debugging.nix b/config/debugging.nix
index 98cc9d9..30d040c 100644
--- a/config/debugging.nix
+++ b/config/debugging.nix
@@ -1,11 +1,9 @@
 {pkgs, ...}: {
+  plugins.dap-ui.settings.floating.mappings = {close = ["<ESC>" "q"];};
+  plugins.dap-ui.enable = true;
+  plugins.dap-virtual-text.enable = true;
   plugins = {
     cmp-dap.enable = true;
-    dap-virtual-text = {enable = true;};
-    dap-ui = {
-      enable = true;
-      settings.floating.mappings = {close = ["<ESC>" "q"];};
-    };
     dap = {
       enable = true;
       extensions = {
diff --git a/config/golang/debugging.nix b/config/golang/debugging.nix
index 4008adb..a6aa98b 100644
--- a/config/golang/debugging.nix
+++ b/config/golang/debugging.nix
@@ -1,6 +1,4 @@
-{ pkgs, ... }: {
-  plugins.dap.extensions.dap-go = {
-    enable = true;
-    delve.path = "${pkgs.delve}/bin/dlv";
-  };
+{pkgs, ...}: {
+  plugins.dap-go.settings.delve.path = "${pkgs.delve}/bin/dlv";
+  plugins.dap-go.enable = true;
 }
diff --git a/config/iac/language.nix b/config/iac/language.nix
index 5037fde..ffb53ac 100644
--- a/config/iac/language.nix
+++ b/config/iac/language.nix
@@ -12,8 +12,8 @@
     lsp.servers = {
       ansiblels.enable = true;
       dockerls.enable = true;
-      helm-ls.enable = true;
-      nginx-language-server.enable = true;
+      helm_ls.enable = true;
+      nginx_language_server.enable = true;
       terraformls.enable = true;
     };
   };
diff --git a/config/javascript/language.nix b/config/javascript/language.nix
index b339bec..ec59071 100644
--- a/config/javascript/language.nix
+++ b/config/javascript/language.nix
@@ -8,7 +8,7 @@
         formatters_by_ft.typescriptreact = ["prettier"];
       };
     };
-    lsp.servers.ts-ls = {
+    lsp.servers.ts_ls = {
       enable = true;
       filetypes = [
         "javascript"
diff --git a/config/python/debugging.nix b/config/python/debugging.nix
index f2f0707..981956f 100644
--- a/config/python/debugging.nix
+++ b/config/python/debugging.nix
@@ -1 +1 @@
-{ plugins.dap.extensions.dap-python.enable = true; }
+{plugins.dap-python.enable = true;}