From cedd4051f7b8ae41712cb87128c1d5f80e851ba6 Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Tue, 20 Jan 2026 12:17:57 -0600
Subject: [PATCH] what a mess

---
 modules/nixos/services/attic/default.nix      |  2 +-
 overlays/linux-cachyos/default.nix            |  6 ++++
 .../cachyos-rc-lto.x86_64-linux.nix           |  2 +-
 packages/linux-cachyos/prepare.nix            | 34 +++++++++++++++----
 systems/x86_64-linux/matt-nixos/boot.nix      |  2 +-
 5 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/modules/nixos/services/attic/default.nix b/modules/nixos/services/attic/default.nix
index f532243..1553a6a 100644
--- a/modules/nixos/services/attic/default.nix
+++ b/modules/nixos/services/attic/default.nix
@@ -137,7 +137,7 @@ let
         distributedBuilds = true;
         buildMachines = [
           {
-            hostName = "10.0.1.18";
+            hostName = "pi5.local";
             system = "aarch64-linux";
             maxJobs = 4;
             sshUser = "matt";
diff --git a/overlays/linux-cachyos/default.nix b/overlays/linux-cachyos/default.nix
index b95571b..b3f6e2d 100644
--- a/overlays/linux-cachyos/default.nix
+++ b/overlays/linux-cachyos/default.nix
@@ -29,6 +29,12 @@ in
     };
   });
 
+  bcachefs = prev.bcachefs.overrideAttrs {
+    meta = prev.meta // {
+      broken = lib.mkForce null;
+    };
+  };
+
   ${namespace} = prev.${namespace} // {
     # GCC Kernels
     # Latest
diff --git a/packages/linux-cachyos/config-nix/x86_64-linux/cachyos-rc-lto.x86_64-linux.nix b/packages/linux-cachyos/config-nix/x86_64-linux/cachyos-rc-lto.x86_64-linux.nix
index b1e8673..4989cb8 100644
--- a/packages/linux-cachyos/config-nix/x86_64-linux/cachyos-rc-lto.x86_64-linux.nix
+++ b/packages/linux-cachyos/config-nix/x86_64-linux/cachyos-rc-lto.x86_64-linux.nix
@@ -9255,7 +9255,7 @@
   "CONFIG_CRYPTO_SEQIV" = "m";
   "CONFIG_CRYPTO_ECHAINIV" = "m";
   "CONFIG_CRYPTO_ESSIV" = "m";
-  "CONFIG_CRYPTO_BLAKE2B" = "y";
+  "CONFIG_CRYPTO_BLAKE2B" = "m";
   "CONFIG_CRYPTO_CMAC" = "m";
   "CONFIG_CRYPTO_GHASH" = "m";
   "CONFIG_CRYPTO_HMAC" = "y";
diff --git a/packages/linux-cachyos/prepare.nix b/packages/linux-cachyos/prepare.nix
index d77af91..177e99c 100644
--- a/packages/linux-cachyos/prepare.nix
+++ b/packages/linux-cachyos/prepare.nix
@@ -9,7 +9,12 @@
   commonMakeFlags,
 }:
 let
-  inherit (cachyConfig.versions.linux) version;
+  version =
+    if stdenv.isAarch64 then
+      version = "6.12.47";
+    else
+      cachyConfig.versions.linux.version;
+
   majorMinor = lib.versions.majorMinor version;
 
   patches-src = fetchFromGitHub {
@@ -31,12 +36,26 @@ let
         inherit (cachyConfig.versions.linux) hash;
       }
     else
-      fetchurl {
-        url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${
-          if version == "${majorMinor}.0" then majorMinor else version
-        }.tar.xz";
-        inherit (cachyConfig.versions.linux) hash;
-      };
+    (
+      if stdenv.isAarch64
+      then
+        let
+          modDirVersion = "6.12.47";
+          tag = "stable_20250916";
+          hash = "sha256-Rjn+eWl5cLcc9wgjS3HYVaWM5eKMN3pPfPbsu+QGR/M=";
+        in
+        fetchurl {
+          url = "https://github.com/raspberrypi/linux/archive/refs/tags/${tag}.tar.gz";
+          hash = hash;
+        }
+      else
+        fetchurl {
+          url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${
+            if version == "${majorMinor}.0" then majorMinor else version
+          }.tar.xz";
+          inherit (cachyConfig.versions.linux) hash;
+        }
+    );
 
   schedPatches =
     if cachyConfig.cpuSched == "eevdf" then
@@ -68,6 +87,7 @@ let
     ++ mArchConfig
     ++ cpuSchedConfig
     ++ [
+      "-m CONFIG_CRYPTO_BLAKE2B"
       # _nr_cpus, defaults to empty, which later set this
       "--set-val NR_CPUS 320"
 
diff --git a/systems/x86_64-linux/matt-nixos/boot.nix b/systems/x86_64-linux/matt-nixos/boot.nix
index fb4c0f7..345ed7e 100755
--- a/systems/x86_64-linux/matt-nixos/boot.nix
+++ b/systems/x86_64-linux/matt-nixos/boot.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  kernel = pkgs.${namespace}.linuxPackages_cachyos-lto-znver4;
+  kernel = pkgs.${namespace}.linuxPackages_cachyos-rc-lto-znver4;
   pkgsVersion = pkgs; # .unstable;
 in
 {