Neovim: Switch from rnix-lsp to nixd

home/features/coding/nvim/default.nix

@@ -7,21 +7,10 @@
 }: let
   vars = import ../../../../vars.nix;
   colors = config.colorScheme.colors;
-in {
+  stableExtraPkgs = with pkgs; [
-  home.sessionVariables.EDITOR = "nvim";
-
-  programs.neovim = {
-    enable = true;
-
-    viAlias = true;
-    vimAlias = true;
-    vimdiffAlias = true;
-
-    extraPackages = with pkgs; [
     # LSP
     lua-language-server
     lua
-      rnix-lsp # nix
 
     # Formatters
     stylua # lua
@@ -42,6 +31,21 @@ in {
     fzf
     gcc
   ];
+  unstableExtraPkgs = with pkgs.unstable; [
+    # LSP
+    nixd
+  ];
+in {
+  home.sessionVariables.EDITOR = "nvim";
+
+  programs.neovim = {
+    enable = true;
+
+    viAlias = true;
+    vimAlias = true;
+    vimdiffAlias = true;
+
+    extraPackages = stableExtraPkgs ++ unstableExtraPkgs;
 
     plugins = with pkgs.vimPlugins; [
       {

home/features/coding/nvim/plugin/lsp.lua

@@ -39,7 +39,7 @@ require("lspconfig").lua_ls.setup({
 	},
 })
 
-require("lspconfig").rnix.setup({
+require("lspconfig").nixd.setup({
 	on_attach = on_attach,
 	capabilities = capabilities,
 })