From 6a2bad0734a4ad4d1eff97e700468020d6285341 Mon Sep 17 00:00:00 2001
From: LordMZTE <lord@mzte.de>
Date: Sat, 4 May 2024 13:09:32 +0200
Subject: [PATCH] update nix nvim-tools

---
 flake.lock                                |  6 ++---
 mzte-nv/conf/lua/pluginconf/p-lspconf.fnl |  1 -
 nix/cgnix/nvim-tools.nix                  | 31 +++++++++++++++++++++--
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 006bd3c..c54114a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1714253743,
-        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
+        "lastModified": 1714635257,
+        "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
+        "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
         "type": "github"
       },
       "original": {
diff --git a/mzte-nv/conf/lua/pluginconf/p-lspconf.fnl b/mzte-nv/conf/lua/pluginconf/p-lspconf.fnl
index df7dfe1..21a62fa 100644
--- a/mzte-nv/conf/lua/pluginconf/p-lspconf.fnl
+++ b/mzte-nv/conf/lua/pluginconf/p-lspconf.fnl
@@ -63,5 +63,4 @@
        {:settings {:rust-analyzer {:checkOnSave {:command :clippy}}}})
 
 (setup :taplo)
-(setup :yamlls)
 (setup :zls)
diff --git a/nix/cgnix/nvim-tools.nix b/nix/cgnix/nvim-tools.nix
index 819a79f..6209b01 100644
--- a/nix/cgnix/nvim-tools.nix
+++ b/nix/cgnix/nvim-tools.nix
@@ -2,17 +2,42 @@
 let
   flakePkg = ref: (builtins.getFlake ref).packages.${system}.default;
   default-packages = with pkgs; [
-    # MISSING: glsl_analyzer, haxe_language_server, prosemd_lsp, racket_langserver, yamlls, zls
+    # MISSING: haxe_language_server, racket_langserver, zls
     # Language Servers
-    (flakePkg "github:oxalica/nil")
     (pkgs.linkFarm "clang-nvim" (map
       (bin: { name = "bin/${bin}"; path = "${clang-tools}/bin/${bin}"; })
       [ "clangd" "clang-format" ])) # Don't include everything from clang-tools
     elixir-ls
+    (pkgs.stdenv.mkDerivation {
+      name = "glsl-analyzer";
+      src = pkgs.fetchFromGitHub {
+        owner = "nolanderc";
+        repo = "glsl_analyzer";
+        rev = "3514b232795858c6a1870832d2ff033eb54103ab";
+        leaveDotGit = true;
+        hash = "sha256-2+Q9A6QXbMuwlHRK2d1xxK3OBzk/I/cw96H6o4YnVKc=";
+      };
+
+      dontConfigure = true;
+
+      nativeBuildInputs = with pkgs; [ zig_0_12.hook git ];
+    })
     jdt-language-server
     lua-language-server
+    (flakePkg "github:oxalica/nil")
     ocamlPackages.ocaml-lsp
     openscad-lsp
+    (pkgs.rustPlatform.buildRustPackage {
+      name = "prosemd-lsp";
+      src = pkgs.fetchFromGitHub {
+        owner = "kitten";
+        repo = "prosemd-lsp";
+        rev = "d6073d9ec269cec820b3efc77e0f62bcff47790e";
+        hash = "sha256-Mkbl8wT04sNjV7fpDJh9HbEqnCdi6SMXdlPCbT2801c=";
+      };
+
+      cargoSha256 = "sha256-/jx1hC/98v5L8XLG3ecFkk5H60HDtaKede+a8HDeFk4=";
+    })
     taplo
     vscode-langservers-extracted # cssls, eslint, html, jsonls
 
@@ -20,6 +45,8 @@ let
     (pkgs.linkFarm "prettier" [{ name = "bin/prettier"; path = "${nodePackages.prettier}/bin/prettier"; }]) # needed due to symlink shenanigans
     fnlfmt
     nixpkgs-fmt
+    shfmt
+    stylua
 
     # Misc
     html-tidy