From f3a5e0a54c35d6fb51caa034510c59a475d7b380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Sat, 9 Nov 2024 15:38:21 +0100
Subject: [PATCH] neovim: move lsp to config file, add xml lsp

---
 configs/neovim.nix   | 13 +++++++++++++
 configs/packages.nix | 11 -----------
 lib/vim/init.lua     |  1 +
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/configs/neovim.nix b/configs/neovim.nix
index 26845f0..2be26ed 100644
--- a/configs/neovim.nix
+++ b/configs/neovim.nix
@@ -36,5 +36,18 @@
   environment.systemPackages = [
     (pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
     niveumPackages.vim
+
+    # language servers
+    pkgs.pyright
+    pkgs.haskellPackages.haskell-language-server
+    pkgs.texlab
+    pkgs.nil
+    pkgs.rust-analyzer
+    pkgs.nodePackages.typescript-language-server
+    pkgs.lua-language-server
+    pkgs.nodePackages.vscode-langservers-extracted
+    pkgs.lemminx
+    niveumPackages.jq-lsp
+    pkgs.dhall-lsp-server
   ];
 }
diff --git a/configs/packages.nix b/configs/packages.nix
index 6ad9509..a350904 100644
--- a/configs/packages.nix
+++ b/configs/packages.nix
@@ -232,17 +232,6 @@ in {
     ]))
     # python3Packages.poetry
 
-    # language servers
-    pyright
-    haskellPackages.haskell-language-server
-    texlab
-    nil
-    rust-analyzer
-    nodePackages.typescript-language-server
-    lua-language-server
-    nodePackages.vscode-langservers-extracted
-
-    dhall-lsp-server
     dhall-nix
     dhall-bash
     dhall-json
diff --git a/lib/vim/init.lua b/lib/vim/init.lua
index e5a4d3c..695dbb8 100644
--- a/lib/vim/init.lua
+++ b/lib/vim/init.lua
@@ -112,6 +112,7 @@ local language_servers = {
   hls = {}, -- haskell-language-server
   html = {}, -- vscode-langservers-extracted
   jsonls = {}, -- vscode-langservers-extracted
+  lemminx = {}, -- lemminx (for xml)
   nil_ls = {}, -- github:oxalica/nil
   dhall_lsp_server = {}, -- dhall-lsp-server
   -- rnix = {}, -- rnix-lsp