Skip to content

Commit 6e17b4c

Browse files
klarkcmattn
authored andcommitted
Deprecate rnix-lsp and add nil
1 parent 8ce8aba commit 6e17b4c

File tree

6 files changed

+33
-1
lines changed

6 files changed

+33
-1
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ You can change the directory to install servers by set `g:lsp_settings_servers_d
138138
| Markdown | Marksman | Yes | Yes |
139139
| Nim | nimls | No | No |
140140
| Nix | nixd | Yes | Yes |
141-
| Nix | rnix-lsp | Yes | Yes |
141+
| Nix | nil | Yes | Yes |
142142
| PHP | intelephense | Yes | Yes |
143143
| PHP | psalm-language-server | Yes | Yes |
144144
| OCaml | ocaml-lsp | UNIX Only | Yes |

installer/install-nil-lsp.cmd

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@echo off
2+
3+
call nix-env -f -iA nixpkgs.nil
4+

installer/install-nil-lsp.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
5+
nix-env -f -iA nixpkgs.nil

settings.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,6 +1047,14 @@
10471047
}
10481048
],
10491049
"nix": [
1050+
{
1051+
"command": "nil",
1052+
"url": "https://github.com/oxalica/nil",
1053+
"description": "Nix Language server, an incremental analysis assistant for writing in Nix",
1054+
"requires": [
1055+
"nix"
1056+
]
1057+
},
10501058
{
10511059
"command": "rnix-lsp",
10521060
"url": "https://github.com/nix-community/rnix-lsp",

settings/nil.vim

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
augroup vim_lsp_settings_nil
2+
au!
3+
LspRegisterServer {
4+
\ 'name': 'nil',
5+
\ 'cmd': {server_info->lsp_settings#get('nil', 'cmd', lsp_settings#exec_path('nil'))},
6+
\ 'root_uri':{server_info->lsp_settings#get('nil', 'root_uri', lsp_settings#root_uri('nil'))},
7+
\ 'initialization_options': lsp_settings#get('nil', 'initialization_options', {}),
8+
\ 'allowlist': lsp_settings#get('nil', 'allowlist', ['nix']),
9+
\ 'blocklist': lsp_settings#get('nil', 'blocklist', []),
10+
\ 'config': lsp_settings#get('nil', 'config', lsp_settings#server_config('nil')),
11+
\ 'workspace_config': lsp_settings#get('nil', 'workspace_config', {}),
12+
\ 'semantic_highlight': lsp_settings#get('nil', 'semantic_highlight', {}),
13+
\ }
14+
augroup END

settings/rnix-lsp.vim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ augroup vim_lsp_settings_rnix_lsp
1010
\ 'config': lsp_settings#get('rnix-lsp', 'config', lsp_settings#server_config('rnix-lsp')),
1111
\ 'workspace_config': lsp_settings#get('rnix-lsp', 'workspace_config', {}),
1212
\ 'semantic_highlight': lsp_settings#get('rnix-lsp', 'semantic_highlight', {}),
13+
\ 'deprecated': v:true,
1314
\ }
1415
augroup END

0 commit comments

Comments
 (0)