From 6eb3487673190ad80f015c25440fa68ff16f6556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 7 Jan 2025 07:23:19 +0100
Subject: [PATCH] exfat support

---
 example/complex.nix      | 6 +++---
 lib/types/filesystem.nix | 3 ++-
 tests/cli.nix            | 2 +-
 tests/complex.nix        | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/example/complex.nix b/example/complex.nix
index 45be7e77..ac343c69 100644
--- a/example/complex.nix
+++ b/example/complex.nix
@@ -107,13 +107,13 @@
             lvm_type = "mirror";
             content = {
               type = "filesystem";
-              format = "ext4";
-              mountpoint = "/ext4_on_lvm";
+              format = "exfat";
+              mountpoint = "/exfat_on_lvm";
               mountOptions = [
                 "defaults"
               ];
               postMountHook = ''
-                touch /mnt/ext4_on_lvm/file-from-postMountHook
+                touch /mnt/exfat_on_lvm/file-from-postMountHook
               '';
             };
           };
diff --git a/lib/types/filesystem.nix b/lib/types/filesystem.nix
index b957898a..d6a19a8e 100644
--- a/lib/types/filesystem.nix
+++ b/lib/types/filesystem.nix
@@ -106,7 +106,6 @@
           pkgs.gnugrep
         ]
         ++ (
-          # TODO add many more
           if (config.format == "xfs") then
             [ pkgs.xfsprogs ]
           else if (config.format == "btrfs") then
@@ -123,6 +122,8 @@
             [ pkgs.bcachefs-tools ]
           else if (config.format == "f2fs") then
             [ pkgs.f2fs-tools ]
+          else if (config.format == "exfat") then
+            [ pkgs.exfatprogs ]
           else
             [ ]
         );
diff --git a/tests/cli.nix b/tests/cli.nix
index 3fe0f7c0..721377be 100644
--- a/tests/cli.nix
+++ b/tests/cli.nix
@@ -19,7 +19,7 @@ diskoLib.testLib.makeDiskoTest {
     machine.succeed("mountpoint /zfs_fs");
     machine.succeed("mountpoint /zfs_legacy_fs");
     machine.succeed("mountpoint /ext4onzfs");
-    machine.succeed("mountpoint /ext4_on_lvm");
+    machine.succeed("mountpoint /exfat_on_lvm");
   '';
   extraSystemConfig = {
     imports = [
diff --git a/tests/complex.nix b/tests/complex.nix
index 2f821c6c..28cb5c3f 100644
--- a/tests/complex.nix
+++ b/tests/complex.nix
@@ -19,10 +19,10 @@ diskoLib.testLib.makeDiskoTest {
     machine.succeed("mountpoint /zfs_fs");
     machine.succeed("mountpoint /zfs_legacy_fs");
     machine.succeed("mountpoint /ext4onzfs");
-    machine.succeed("mountpoint /ext4_on_lvm");
+    machine.succeed("mountpoint /exfat_on_lvm");
 
 
-    machine.succeed("test -e /ext4_on_lvm/file-from-postMountHook");
+    machine.succeed("test -e /exfat_on_lvm/file-from-postMountHook");
   '';
   extraInstallerConfig = {
     boot.kernelModules = [