From bf1706b0faad25ed09fe304ffd7ee826d42c9158 Mon Sep 17 00:00:00 2001
From: foxora <foxora@noreply.tearforge.net>
Date: Sat, 21 Feb 2026 19:42:57 +0000
Subject: [PATCH] fixed lsp and formatter stuff!! <3

---
 flake.lock                                |  6 +++---
 homes/modules/programs/neovim/nixcats.nix | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index ddf7975..d2b22c3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1293,11 +1293,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1771439456,
-        "narHash": "sha256-HtQgNJrjYvZdpqpPJddF+TxGCazNyxvA8umbDcjrxT8=",
+        "lastModified": 1771702014,
+        "narHash": "sha256-/P7uAp8q1xFhaw9Z+OG7lUK3wVz1Q/wreAyeiMyyjLI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f84d6f6cd5f17d594439710f40349ba7d0706f4b",
+        "rev": "cceb9213362e92c06b60b50c1e2877bc5fb95887",
         "type": "github"
       },
       "original": {
diff --git a/homes/modules/programs/neovim/nixcats.nix b/homes/modules/programs/neovim/nixcats.nix
index d1ee226..d0bb93f 100644
--- a/homes/modules/programs/neovim/nixcats.nix
+++ b/homes/modules/programs/neovim/nixcats.nix
@@ -85,10 +85,10 @@ in {
             gleam = [
               gleam
             ];
-            haskell = [
-              haskell-language-server
-              ormolu
-            ];
+            haskell = {
+              lsp = [ haskell-language-server ];
+              format = [ ormolu ];
+            };
             java = [
               jdt-language-server
               javaPackages.compiler.openjdk17
@@ -166,15 +166,15 @@ in {
         };
         environmentVariables = {
           lang = {
-            rust = {
+            rust.lsp = {
               # it literally won't see the rust-analyzer provided to it
               # if you don't use an envrionment variable to tell it
-              RUST_ANALYZER_CMD = "${pkgs.rust-analyzer}/bin/rust-analyzer";
+              RUST_ANALYZER_CMD = "${mpkgs.rust-analyzer}/bin/rust-analyzer";
             };
-            elixir = {
+            elixir.lsp = {
               ELIXIR_LS_CMD = "${pkgs.elixir-ls}/scripts/language_server.sh";
             };
-            java = {
+            java.lsp = {
               JAVA_HOME = "${pkgs.javaPackages.compiler.openjdk17}";
               OPENJDK_17 = "${pkgs.javaPackages.compiler.openjdk17}";
               OPENJDK_21 = "${pkgs.javaPackages.compiler.openjdk21}";