From fa0210e9372b6a7156705c99124c07a8781ce8c1 Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Mon, 15 Dec 2025 14:59:29 -0600
Subject: [PATCH] pi stuff

---
 systems/aarch64-linux/pi5/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/systems/aarch64-linux/pi5/default.nix b/systems/aarch64-linux/pi5/default.nix
index e9fdd75..2c70d06 100644
--- a/systems/aarch64-linux/pi5/default.nix
+++ b/systems/aarch64-linux/pi5/default.nix
@@ -3,6 +3,7 @@
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
 {
+ lib,
   namespace,
   ...
 }:
@@ -92,7 +93,12 @@
   # #                  FileSystems                  # #
   # ###################################################
 
+<<<<<<< HEAD
   boot.supportedFilesystems = [ "bcachefs" ];
+=======
+  boot.supportedFilesystems = lib.mkForce [ "bcachefs" ];
+
+>>>>>>> edbb7bb (pi stuff)
   fileSystems."/data" = {
     device = "/dev/disk/by-uuid/a85420cc-a026-4100-80d2-a999081d792a";
     fsType = "bcachefs";