From 1776e1d58d85124f82c08b66b323c9cb73fe5cf9 Mon Sep 17 00:00:00 2001
From: foxora <foxora@noreply.tearforge.net>
Date: Sun, 3 May 2026 15:06:05 +0100
Subject: [PATCH] actually fixed rust-analyzer this time

---
 flake.lock                                | 60 ++++++++++++++++++++++-
 flake.nix                                 | 18 +++++--
 homes/modules/programs/neovim/nixcats.nix | 17 ++++---
 3 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index 864db1d..bb69c6b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -227,12 +227,33 @@
       }
     },
     "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1777796307,
+        "narHash": "sha256-L7xLjorTwVf2aLu5b0ZZY2D0RFXwD/a/a/fFFDikB2w=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "0f9881f2344c0b1c100bd9e774555759b7da6fd5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
+    "fenix_2": {
       "inputs": {
         "nixpkgs": [
           "iamb",
           "nixpkgs"
         ],
-        "rust-analyzer-src": "rust-analyzer-src"
+        "rust-analyzer-src": "rust-analyzer-src_2"
       },
       "locked": {
         "lastModified": 1760510549,
@@ -890,7 +911,7 @@
     "iamb": {
       "inputs": {
         "crane": "crane",
-        "fenix": "fenix",
+        "fenix": "fenix_2",
         "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs-unstable"
@@ -1364,6 +1385,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-rust": {
+      "locked": {
+        "lastModified": 1776371872,
+        "narHash": "sha256-hVIxbmDzNoXnzobtujvL189+YPrqr0QWF5fn+13+CtY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "838f1611dc4c0078432071819d6fffe046148813",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "838f1611dc4c0078432071819d6fffe046148813",
+        "type": "github"
+      }
+    },
     "nixpkgs-staging": {
       "locked": {
         "lastModified": 1777791170,
@@ -1493,6 +1530,7 @@
         "awww": "awww",
         "cachyos": "cachyos",
         "cerulean": "cerulean",
+        "fenix": "fenix",
         "home-manager": "home-manager_2",
         "home-manager-unstable": "home-manager-unstable",
         "hyprland-git": "hyprland-git",
@@ -1505,6 +1543,7 @@
         "nixcord": "nixcord",
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-master": "nixpkgs-master",
+        "nixpkgs-rust": "nixpkgs-rust",
         "nixpkgs-staging": "nixpkgs-staging",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "sddm-silent": "sddm-silent",
@@ -1514,6 +1553,23 @@
       }
     },
     "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1777768857,
+        "narHash": "sha256-zfekJcaVctfAps1KDHwZpwkvAQn7GObRHh3Gl3xocGI=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "1102c0b633599564919e36076d4362d7e68dbddc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
+    "rust-analyzer-src_2": {
       "flake": false,
       "locked": {
         "lastModified": 1760457219,
diff --git a/flake.nix b/flake.nix
index 9f18969..ef91d7c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,9 @@
     nixpkgs-staging.url = "github:NixOS/nixpkgs/staging-next";
     nixpkgs-master.url = "github:NixOS/nixpkgs/master";
 
+    # currently a regression: https://github.com/rust-lang/rust-analyzer/pull/22207
+    nixpkgs-rust.url = "github:NixOS/nixpkgs/838f1611dc4c0078432071819d6fffe046148813";
+
     home-manager = {
       url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -52,6 +55,11 @@
 
     nixcats.url = "github:BirdeeHub/nixCats-nvim";
 
+    fenix = {
+      url = "github:nix-community/fenix";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+
     awww = {
       url = "git+https://codeberg.org/LGFae/awww";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
@@ -85,14 +93,14 @@
       };
     };
 
-    # temp theme until i bother creating my own </3
-    sddm-silent = {
-      url = "github:uiriansan/SilentSDDM";
+    mcsr = {
+      url = "https://git.uku3lig.net/uku/mcsr-nixos/archive/main.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 
-    mcsr = {
-      url = "https://git.uku3lig.net/uku/mcsr-nixos/archive/main.tar.gz";
+    # temp theme until i bother creating my own </3
+    sddm-silent = {
+      url = "github:uiriansan/SilentSDDM";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
   };
diff --git a/homes/modules/programs/neovim/nixcats.nix b/homes/modules/programs/neovim/nixcats.nix
index 78ed79b..0e25b69 100644
--- a/homes/modules/programs/neovim/nixcats.nix
+++ b/homes/modules/programs/neovim/nixcats.nix
@@ -1,10 +1,6 @@
 # TODO: look into changing to this:
 # https://github.com/BirdeeHub/nix-wrapper-modules
-{
-  inputs,
-  upkgs,
-  ...
-}: let
+{inputs, ...}: let
   inherit
     (inputs.nixcats)
     utils
@@ -62,11 +58,16 @@ in {
               docs = [nix-doc]; # TODO: i forgot how to integrate this into neovim
             };
             rust = {
-              lsp = [cargo upkgs.rust-analyzer];
+              lsp = [
+                cargo
+                # !!!!!!!!! remember to change environment variable !!!!!!!!!!!!
+                # currently a regression: https://github.com/rust-lang/rust-analyzer/pull/22207
+                inputs.nixpkgs-rust.legacyPackages.${system}.rust-analyzer
+              ];
               # nightly rustfmt has nicer features :3
               format = [(rustfmt.override {asNightly = true;})];
               formatters = {
-                  leptos = [leptosfmt];
+                leptos = [leptosfmt];
               };
             };
             zig = {
@@ -197,7 +198,7 @@ in {
             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 = "${upkgs.rust-analyzer}/bin/rust-analyzer";
+              RUST_ANALYZER_CMD = "${inputs.nixpkgs-rust.legacyPackages.${pkgs.system}.rust-analyzer}/bin/rust-analyzer";
             };
             elixir.lsp = {
               ELIXIR_LS_CMD = "${pkgs.elixir-ls}/scripts/language_server.sh";