From 49da7d13ad46e59e89c82e26abd34a6aea2fe38b Mon Sep 17 00:00:00 2001
From: Nick Breitling <Breitling.nw@gmail.com>
Date: Fri, 25 Oct 2024 01:26:23 -0500
Subject: [PATCH] fix: nixd option groups and documentation page (#4594)

* Nix autocompletion options

* Support for formatting with nixd

* Revert nixd lsp name

* Fix nixd option groups

* Fixed documentation pages for nixd and rnix

* fix: use backticks for nixd documentation examples
---
 clients/lsp-nix.el    | 14 +++++++-------
 docs/lsp-clients.json |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/clients/lsp-nix.el b/clients/lsp-nix.el
index a38a4f919f..52f1356536 100644
--- a/clients/lsp-nix.el
+++ b/clients/lsp-nix.el
@@ -57,7 +57,7 @@
 (lsp-defcustom lsp-nix-nixd-formatting-command nil
   "External formatter command with arguments.
 
-  Example: [ \"nixpkgs-fmt\" ]"
+  Example: `[\"nixpkgs-fmt\"]`"
   :type 'lsp-string-vector
   :group 'lsp-nix-nixd
   :lsp-path "nixd.formatting.command"
@@ -70,7 +70,7 @@
   Resource Usage: Entries are lazily evaluated, entire nixpkgs takes 200~300MB
   for just \"names\". Package documentation, versions, are evaluated by-need.
 
-  Example: \"import <nixpkgs> { }\""
+  Example: `\"import <nixpkgs> { }\"`"
   :type 'string
   :group 'lsp-nix-nixd
   :lsp-path "nixd.nixpkgs.expr"
@@ -78,12 +78,12 @@
 
 (lsp-defcustom lsp-nix-nixd-nixos-options-expr nil
   "Option set for NixOS option completion. If this is omitted, the default
-  search path (<nixpkgs>) will be used.
+  search path (`<nixpkgs>`) will be used.
 
   Example:
-  \"(builtins.getFlake \"/home/lyc/flakes\").nixosConfigurations.adrastea.options\""
+  `\"(builtins.getFlake \"/home/lyc/flakes\").nixosConfigurations.adrastea.options\"`"
   :type 'string
-  :group 'lsp-nix-nil
+  :group 'lsp-nix-nixd
   :lsp-path "nixd.options.nixos.expr"
   :package-version '(lsp-mode . "9.0.1"))
 
@@ -91,9 +91,9 @@
   "Option set for home-manager option completion.
 
   Example:
-  \"(builtins.getFlake \"/home/lyc/flakes\").nixosConfigurations.adrastea.options\""
+  `\"(builtins.getFlake \"/home/lyc/flakes\").nixosConfigurations.adrastea.options\"`"
   :type 'string
-  :group 'lsp-nix-nil
+  :group 'lsp-nix-nixd
   :lsp-path "nixd.options.home-manager.expr"
   :package-version '(lsp-mode . "9.0.1"))
 
diff --git a/docs/lsp-clients.json b/docs/lsp-clients.json
index 79ec7cab41..b0b17a587d 100644
--- a/docs/lsp-clients.json
+++ b/docs/lsp-clients.json
@@ -710,7 +710,7 @@
     "debugger": "Not available"
   },
   {
-    "name": "nix",
+    "name": "nix-nixd",
     "full-name": "Nix (nixd language server)",
     "server-name": "nixd",
     "server-url": "https://github.com/nix-community/nixd",
@@ -718,7 +718,7 @@
     "debugger": "Not available"
   },
   {
-    "name": "nix",
+    "name": "nix-rnix",
     "full-name": "Nix (rnix language server)",
     "server-name": "rnix-lsp",
     "server-url": "https://github.com/nix-community/rnix-lsp",