From cc61a97263b5622d926bbe586c3c0205f4203ca8 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Fri, 18 Jul 2025 10:45:01 +0200
Subject: ...

---
 hosts/sif/hw.nix             |  3 +--
 system-profiles/bcachefs.nix | 12 +++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/hosts/sif/hw.nix b/hosts/sif/hw.nix
index 81349dda..e567c37d 100644
--- a/hosts/sif/hw.nix
+++ b/hosts/sif/hw.nix
@@ -11,7 +11,6 @@
       { options = [
           "x-systemd.requires=/dev/disk/by-id/dm-name-sif-nvm0"
           "x-systemd.requires=/dev/disk/by-id/dm-name-sif-nvm1"
-          "casefold_disabled"
         ];
         device = "/dev/disk/by-uuid/fe7bdaac-d2f3-4535-a635-e2fb97ef3802";
         fsType = "bcachefs";
@@ -26,7 +25,7 @@
   # system.etc.overlay.enable = false;
 
   boot.initrd.systemd.packages = [
-    (pkgs.writeTextDir "/etc/systemd/system/-sysroot-.bcachefs.mount.d/block_scan.conf" ''
+    (pkgs.writeTextDir "/etc/systemd/system/sysroot-.bcachefs.mount.d/block_scan.conf" ''
       [Mount]
       Environment=BCACHEFS_BLOCK_SCAN=1
     '')
diff --git a/system-profiles/bcachefs.nix b/system-profiles/bcachefs.nix
index f9f048b9..ddddcc93 100644
--- a/system-profiles/bcachefs.nix
+++ b/system-profiles/bcachefs.nix
@@ -1,6 +1,16 @@
-{ pkgs, ... } : {
+{ pkgs, lib, ... } : {
   config = {
     boot.supportedFilesystems.bcachefs = true;
     environment.systemPackages = with pkgs; [ bcachefs-tools ];
+
+    boot.kernelPatches = [
+      {
+        name = "bcachefs-casefold-fix";
+        patch = null;
+        extraStructuredConfig = with lib.kernel; {
+          UNICODE = no;
+        };
+      }
+    ];
   };
 }
-- 
cgit v1.2.3