From ea69c1d12c7404db08ce63b44626afe18820d496 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sun, 2 Jul 2023 02:50:01 +0200
Subject: [PATCH] neovim: use nixd as nix language server

---
 modules/terminal-life/nvim/default.nix | 4 ++--
 modules/terminal-life/nvim/lsp.vim     | 2 +-
 overlays/overrides.nix                 | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix
index 1afb5088..a2a2171a 100644
--- a/modules/terminal-life/nvim/default.nix
+++ b/modules/terminal-life/nvim/default.nix
@@ -25,6 +25,7 @@ in {
       ansible-language-server
       ccls
       gopls
+      nixd
       nodejs
       nodePackages.bash-language-server
       nodePackages.dockerfile-language-server-nodejs
@@ -37,9 +38,8 @@ in {
       nodePackages.yaml-language-server
       python3Packages.python-lsp-server
       python3Full
-      solargraph
-      rnix-lsp
       rust-analyzer
+      solargraph
       terraform-ls
       universal-ctags
     ];
diff --git a/modules/terminal-life/nvim/lsp.vim b/modules/terminal-life/nvim/lsp.vim
index 399e52e4..fb28b954 100644
--- a/modules/terminal-life/nvim/lsp.vim
+++ b/modules/terminal-life/nvim/lsp.vim
@@ -122,9 +122,9 @@ lua <<EOF
                 }
             }
         },
+        'nixd', --------------------------------- Nix
         'phpactor', ----------------------------- PHP
         'pylsp', -------------------------------- Python
-        'rnix', --------------------------------- Nix
         'solargraph', --------------------------- Ruby
         'rust_analyzer', ------------------------ Rust
         ['sqlls'] = {
diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index 7bea8fc0..37a8e0e8 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -3,6 +3,7 @@ channels: final: prev: {
 
   inherit
     (channels.latest)
+    nixd
     ;
 
   haskellPackages =
@@ -18,4 +19,6 @@ channels: final: prev: {
           ;
       });
     });
+
+  vimPlugins = prev.vimPlugins // {inherit (channels.latest.vimPlugins) nvim-lspconfig;};
 }