Skip to content

Commit 49da7d1

Browse files
authored
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
1 parent 1c407ec commit 49da7d1

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

clients/lsp-nix.el

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
(lsp-defcustom lsp-nix-nixd-formatting-command nil
5858
"External formatter command with arguments.
5959
60-
Example: [ \"nixpkgs-fmt\" ]"
60+
Example: `[\"nixpkgs-fmt\"]`"
6161
:type 'lsp-string-vector
6262
:group 'lsp-nix-nixd
6363
:lsp-path "nixd.formatting.command"
@@ -70,30 +70,30 @@
7070
Resource Usage: Entries are lazily evaluated, entire nixpkgs takes 200~300MB
7171
for just \"names\". Package documentation, versions, are evaluated by-need.
7272
73-
Example: \"import <nixpkgs> { }\""
73+
Example: `\"import <nixpkgs> { }\"`"
7474
:type 'string
7575
:group 'lsp-nix-nixd
7676
:lsp-path "nixd.nixpkgs.expr"
7777
:package-version '(lsp-mode . "9.0.1"))
7878

7979
(lsp-defcustom lsp-nix-nixd-nixos-options-expr nil
8080
"Option set for NixOS option completion. If this is omitted, the default
81-
search path (<nixpkgs>) will be used.
81+
search path (`<nixpkgs>`) will be used.
8282
8383
Example:
84-
\"(builtins.getFlake \"/home/lyc/flakes\").nixosConfigurations.adrastea.options\""
84+
`\"(builtins.getFlake \"/home/lyc/flakes\").nixosConfigurations.adrastea.options\"`"
8585
:type 'string
86-
:group 'lsp-nix-nil
86+
:group 'lsp-nix-nixd
8787
:lsp-path "nixd.options.nixos.expr"
8888
:package-version '(lsp-mode . "9.0.1"))
8989

9090
(lsp-defcustom lsp-nix-nixd-home-manager-options-expr nil
9191
"Option set for home-manager option completion.
9292
9393
Example:
94-
\"(builtins.getFlake \"/home/lyc/flakes\").nixosConfigurations.adrastea.options\""
94+
`\"(builtins.getFlake \"/home/lyc/flakes\").nixosConfigurations.adrastea.options\"`"
9595
:type 'string
96-
:group 'lsp-nix-nil
96+
:group 'lsp-nix-nixd
9797
:lsp-path "nixd.options.home-manager.expr"
9898
:package-version '(lsp-mode . "9.0.1"))
9999

docs/lsp-clients.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -710,15 +710,15 @@
710710
"debugger": "Not available"
711711
},
712712
{
713-
"name": "nix",
713+
"name": "nix-nixd",
714714
"full-name": "Nix (nixd language server)",
715715
"server-name": "nixd",
716716
"server-url": "https://github.com/nix-community/nixd",
717717
"installation": "nix profile install github:nixos/nixpkgs#nixd",
718718
"debugger": "Not available"
719719
},
720720
{
721-
"name": "nix",
721+
"name": "nix-rnix",
722722
"full-name": "Nix (rnix language server)",
723723
"server-name": "rnix-lsp",
724724
"server-url": "https://github.com/nix-community/rnix-lsp",

0 commit comments

Comments
 (0)