From a7f73290d51a37d56ef7d16035d3497c830db2c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 11 Jun 2023 06:48:02 +0200
Subject: [PATCH] nixos noninteractive: re-add missing filesystems

---
 nix/noninteractive.nix | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/nix/noninteractive.nix b/nix/noninteractive.nix
index fabe6a7..00af8fc 100644
--- a/nix/noninteractive.nix
+++ b/nix/noninteractive.nix
@@ -9,27 +9,47 @@
   ];
 
   # among others, this prevents carrying a stdenv with gcc in the image
-  system.extraDependencies = lib.mkForce [];
+  system.extraDependencies = lib.mkForce [ ];
 
   # prevents shipping nixpkgs, unnecessary if system is evaluated externally
-  nix.registry = lib.mkForce {};
+  nix.registry = lib.mkForce { };
 
   # would pull in nano
   programs.nano.syntaxHighlight = lib.mkForce false;
 
   # prevents nano, strace
-  environment.defaultPackages = lib.mkForce [ 
-    pkgs.rsync 
+  environment.defaultPackages = lib.mkForce [
+    pkgs.rsync
     pkgs.parted
-    pkgs.zfs
+    (pkgs.zfs.override {
+      # this overrides saves 10MB
+      samba = pkgs.coreutils;
+    })
   ];
 
-  # zfs support is accidentally disabled by excluding base.nix, re-enable it
+  # we are missing this from base.nix
+  boot.supportedFilesystems = [
+    "btrfs"
+    # probably not needed but does not seem to increase closure size
+    "cifs"
+    "f2fs"
+    ## anyone still using this over ext4?
+    #"jfs"
+    "ntfs"
+    ## no longer seems to be maintained, anyone still using it?
+    #"reiserfs"
+    "vfat"
+    "xfs"
+  ];
   boot = {
     kernelModules = [ "zfs" ];
-    extraModulePackages = [ config.boot.kernelPackages.zfs ];
+    extraModulePackages = [
+      config.boot.kernelPackages.zfs
+    ];
   };
 
+  networking.hostId = lib.mkDefault "8425e349";
+
   # we can drop this after 23.05 has been released, which has this set by default
   hardware.enableRedistributableFirmware = lib.mkForce false;
 }