···

       
105
       
105
       
 
       


     

       
106
       
106
       
 
       
- `nitter` requires a `guest_accounts.jsonl` to be provided as a path or loaded into the default location at `/var/lib/nitter/guest_accounts.jsonl`. See [Guest Account Branch Deployment](https://github.com/zedeus/nitter/wiki/Guest-Account-Branch-Deployment) for details.

     

       
107
       
107
       
 
       


     

       
108
       
108
       
+
       
- `boot.supportedFilesystems` and `boot.initrd.supportedFilesystems` are now attribute sets instead of lists. Assignment from lists as done previously is still supported, but checking whether a filesystem is enabled must now by done using `supportedFilesystems.fs or false` instead of using `lib.elem "fs" supportedFilesystems` as was done previously.

     

       
109
       
109
       
+
       


     

       
108
       
110
       
 
       
- `services.aria2.rpcSecret` has been replaced with `services.aria2.rpcSecretFile`.

     

       
109
       
111
       
 
       
  This was done so that secrets aren't stored in the world-readable nix store.

     

       
110
       
112
       
 
       
  To migrate, you will have create a file with the same exact string, and change

     

···

       
1
       
1
       
-
       
{ pkgs, ... }:

     

       
1
       
1
       
+
       
{ lib, ... }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
{

     

       
4
       
4
       
 
       
  imports = [ ./installation-cd-minimal-new-kernel.nix ];

     

       
5
       
5
       
 
       


     

       
6
       
6
       
-
       
  # Makes `availableOn` fail for zfs, see <nixos/modules/profiles/base.nix>.

     

       
7
       
7
       
-
       
  # This is a workaround since we cannot remove the `"zfs"` string from `supportedFilesystems`.

     

       
8
       
8
       
-
       
  # The proper fix would be to make `supportedFilesystems` an attrset with true/false which we

     

       
9
       
9
       
-
       
  # could then `lib.mkForce false`

     

       
10
       
10
       
-
       
  nixpkgs.overlays = [(final: super: {

     

       
11
       
11
       
-
       
    zfs = super.zfs.overrideAttrs(_: {

     

       
12
       
12
       
-
       
      meta.platforms = [];

     

       
13
       
13
       
-
       
    });

     

       
14
       
14
       
-
       
  })];

     

       
6
       
6
       
+
       
  boot.supportedFilesystems.zfs = lib.mkForce false;

     

       
15
       
7
       
 
       
}

     

···

       
1
       
1
       
-
       
{ pkgs, ... }:

     

       
1
       
1
       
+
       
{ lib, ... }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
{

     

       
4
       
4
       
 
       
  imports = [ ./sd-image-aarch64-new-kernel-installer.nix ];

     

       
5
       
5
       
 
       


     

       
6
       
6
       
-
       
  # Makes `availableOn` fail for zfs, see <nixos/modules/profiles/base.nix>.

     

       
7
       
7
       
-
       
  # This is a workaround since we cannot remove the `"zfs"` string from `supportedFilesystems`.

     

       
8
       
8
       
-
       
  # The proper fix would be to make `supportedFilesystems` an attrset with true/false which we

     

       
9
       
9
       
-
       
  # could then `lib.mkForce false`

     

       
10
       
10
       
-
       
  nixpkgs.overlays = [(final: super: {

     

       
11
       
11
       
-
       
    zfs = super.zfs.overrideAttrs(_: {

     

       
12
       
12
       
-
       
      meta.platforms = [];

     

       
13
       
13
       
-
       
    });

     

       
14
       
14
       
-
       
  })];

     

       
6
       
6
       
+
       
  boot.supportedFilesystems.zfs = lib.mkForce false;

     

       
15
       
7
       
 
       
}

     

···

       
3
       
3
       
 
       
# the modules necessary to mount the root file system, then calls the

     

       
4
       
4
       
 
       
# init in the root file system to start the second boot stage.

     

       
5
       
5
       
 
       


     

       
6
       
6
       
-
       
{ config, lib, utils, pkgs, ... }:

     

       
6
       
6
       
+
       
{ config, options, lib, utils, pkgs, ... }:

     

       
7
       
7
       
 
       


     

       
8
       
8
       
 
       
with lib;

     

       
9
       
9
       
 
       


     
···

       
636
       
636
       
 
       
      };

     

       
637
       
637
       
 
       


     

       
638
       
638
       
 
       
    boot.initrd.supportedFilesystems = mkOption {

     

       
639
       
639
       
-
       
      default = [ ];

     

       
640
       
640
       
-
       
      example = [ "btrfs" ];

     

       
641
       
641
       
-
       
      type = types.listOf types.str;

     

       
642
       
642
       
-
       
      description = lib.mdDoc "Names of supported filesystem types in the initial ramdisk.";

     

       
639
       
639
       
+
       
      default = { };

     

       
640
       
640
       
+
       
      inherit (options.boot.supportedFilesystems) example type description;

     

       
643
       
641
       
 
       
    };

     

       
644
       
642
       
 
       


     

       
645
       
643
       
 
       
    boot.initrd.verbose = mkOption {

     

···

       
246
       
246
       
 
       
    };

     

       
247
       
247
       
 
       


     

       
248
       
248
       
 
       
    boot.supportedFilesystems = mkOption {

     

       
249
       
249
       
-
       
      default = [ ];

     

       
250
       
250
       
-
       
      example = [ "btrfs" ];

     

       
251
       
251
       
-
       
      type = types.listOf types.str;

     

       
252
       
252
       
-
       
      description = lib.mdDoc "Names of supported filesystem types.";

     

       
249
       
249
       
+
       
      default = { };

     

       
250
       
250
       
+
       
      example = lib.literalExpression ''

     

       
251
       
251
       
+
       
        {

     

       
252
       
252
       
+
       
          btrfs = true;

     

       
253
       
253
       
+
       
          zfs = lib.mkForce false;

     

       
254
       
254
       
+
       
        }

     

       
255
       
255
       
+
       
      '';

     

       
256
       
256
       
+
       
      type = types.coercedTo

     

       
257
       
257
       
+
       
        (types.listOf types.str)

     

       
258
       
258
       
+
       
        (enabled: lib.listToAttrs (map (fs: lib.nameValuePair fs true) enabled))

     

       
259
       
259
       
+
       
        (types.attrsOf types.bool);

     

       
260
       
260
       
+
       
      description = lib.mdDoc ''

     

       
261
       
261
       
+
       
        Names of supported filesystem types, or an attribute set of file system types

     

       
262
       
262
       
+
       
        and their state. The set form may be used together with `lib.mkForce` to

     

       
263
       
263
       
+
       
        explicitly disable support for specific filesystems, e.g. to disable ZFS

     

       
264
       
264
       
+
       
        with an unsupported kernel.

     

       
265
       
265
       
+
       
      '';

     

       
253
       
266
       
 
       
    };

     

       
254
       
267
       
 
       


     

       
255
       
268
       
 
       
    boot.specialFileSystems = mkOption {

     

···

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
let

     

       
6
       
6
       
 
       


     

       
7
       
7
       
-
       
  inInitrd = any (fs: fs == "apfs") config.boot.initrd.supportedFilesystems;

     

       
7
       
7
       
+
       
  inInitrd = config.boot.initrd.supportedFilesystems.apfs or false;

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
in

     

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
{

     

       
12
       
12
       
-
       
  config = mkIf (any (fs: fs == "apfs") config.boot.supportedFilesystems) {

     

       
12
       
12
       
+
       
  config = mkIf (config.boot.supportedFilesystems.apfs or false) {

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
    system.fsPackages = [ pkgs.apfsprogs ];

     

       
15
       
15
       
 
       


     

···

       
118
       
118
       
 
       
in

     

       
119
       
119
       
 
       


     

       
120
       
120
       
 
       
{

     

       
121
       
121
       
-
       
  config = lib.mkIf (lib.elem "bcachefs" config.boot.supportedFilesystems) (lib.mkMerge [

     

       
121
       
121
       
+
       
  config = lib.mkIf (config.boot.supportedFilesystems.bcachefs or false) (lib.mkMerge [

     

       
122
       
122
       
 
       
    {

     

       
123
       
123
       
 
       
      inherit assertions;

     

       
124
       
124
       
 
       
      # needed for systemd-remount-fs

     
···

       
133
       
133
       
 
       
      };

     

       
134
       
134
       
 
       
    }

     

       
135
       
135
       
 
       


     

       
136
       
136
       
-
       
    (lib.mkIf ((lib.elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) {

     

       
136
       
136
       
+
       
    (lib.mkIf ((config.boot.initrd.supportedFilesystems.bcachefs or false) || (bootFs != {})) {

     

       
137
       
137
       
 
       
      inherit assertions;

     

       
138
       
138
       
 
       
      # chacha20 and poly1305 are required only for decryption attempts

     

       
139
       
139
       
 
       
      boot.initrd.availableKernelModules = [ "bcachefs" "sha256" "chacha20" "poly1305" ];

     

···

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
let

     

       
6
       
6
       
 
       


     

       
7
       
7
       
-
       
  inInitrd = any (fs: fs == "btrfs") config.boot.initrd.supportedFilesystems;

     

       
8
       
8
       
-
       
  inSystem = any (fs: fs == "btrfs") config.boot.supportedFilesystems;

     

       
7
       
7
       
+
       
  inInitrd = config.boot.initrd.supportedFilesystems.btrfs or false;

     

       
8
       
8
       
+
       
  inSystem = config.boot.supportedFilesystems.btrfs or false;

     

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
  cfgScrub = config.services.btrfs.autoScrub;

     

       
11
       
11
       
 
       


     

···

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
let

     

       
6
       
6
       
 
       


     

       
7
       
7
       
-
       
  inInitrd = any (fs: fs == "cifs") config.boot.initrd.supportedFilesystems;

     

       
7
       
7
       
+
       
  inInitrd = config.boot.initrd.supportedFilesystems.cifs or false;

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
in

     

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
{

     

       
12
       
12
       
 
       
  config = {

     

       
13
       
13
       
 
       


     

       
14
       
14
       
-
       
    system.fsPackages = mkIf (any (fs: fs == "cifs") config.boot.supportedFilesystems) [ pkgs.cifs-utils ];

     

       
14
       
14
       
+
       
    system.fsPackages = mkIf (config.boot.supportedFilesystems.cifs or false) [ pkgs.cifs-utils ];

     

       
15
       
15
       
 
       


     

       
16
       
16
       
 
       
    boot.initrd.availableKernelModules = mkIf inInitrd

     

       
17
       
17
       
 
       
      [ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" "sha256" ];

     

···

       
4
       
4
       
 
       
with lib;

     

       
5
       
5
       
 
       


     

       
6
       
6
       
 
       
{

     

       
7
       
7
       
-
       
  config = mkIf (any (fs: fs == "ecryptfs") config.boot.supportedFilesystems) {

     

       
7
       
7
       
+
       
  config = mkIf (config.boot.supportedFilesystems.ecryptfs or false) {

     

       
8
       
8
       
 
       
    system.fsPackages = [ pkgs.ecryptfs ];

     

       
9
       
9
       
 
       
    security.wrappers = {

     

       
10
       
10
       
 
       
      "mount.ecryptfs_private" =

     

···

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
let

     

       
4
       
4
       
 
       


     

       
5
       
5
       
-
       
  inInitrd = lib.any (fs: fs == "erofs") config.boot.initrd.supportedFilesystems;

     

       
6
       
6
       
-
       
  inSystem = lib.any (fs: fs == "erofs") config.boot.supportedFilesystems;

     

       
5
       
5
       
+
       
  inInitrd = config.boot.initrd.supportedFilesystems.erofs or false;

     

       
6
       
6
       
+
       
  inSystem = config.boot.supportedFilesystems.erofs or false;

     

       
7
       
7
       
 
       


     

       
8
       
8
       
 
       
in

     

       
9
       
9
       
 
       


     

···

       
3
       
3
       
 
       
with lib;

     

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
{

     

       
6
       
6
       
-
       
  config = mkIf (any (fs: fs == "exfat") config.boot.supportedFilesystems) {

     

       
6
       
6
       
+
       
  config = mkIf (config.boot.supportedFilesystems.exfat or false) {

     

       
7
       
7
       
 
       
    system.fsPackages = if config.boot.kernelPackages.kernelOlder "5.7" then [

     

       
8
       
8
       
 
       
      pkgs.exfat # FUSE

     

       
9
       
9
       
 
       
    ] else [

     

···

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
let

     

       
4
       
4
       
 
       


     

       
5
       
5
       
-
       
  inInitrd = lib.any (fs: fs == "ext2" || fs == "ext3" || fs == "ext4") config.boot.initrd.supportedFilesystems;

     

       
6
       
6
       
-
       
  inSystem = lib.any (fs: fs == "ext2" || fs == "ext3" || fs == "ext4") config.boot.supportedFilesystems;

     

       
5
       
5
       
+
       
  hasExtX = s: s.ext2 or s.ext3 or s.ext4 or false;

     

       
6
       
6
       
+
       


     

       
7
       
7
       
+
       
  inInitrd = hasExtX config.boot.initrd.supportedFilesystems;

     

       
8
       
8
       
+
       
  inSystem = hasExtX config.boot.supportedFilesystems;

     

       
7
       
9
       
 
       


     

       
8
       
10
       
 
       
in

     

       
9
       
11
       
 
       


     

···

       
3
       
3
       
 
       
with lib;

     

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
let

     

       
6
       
6
       
-
       
  inInitrd = any (fs: fs == "f2fs") config.boot.initrd.supportedFilesystems;

     

       
7
       
7
       
-
       
  fileSystems = filter (x: x.fsType == "f2fs") config.system.build.fileSystems;

     

       
6
       
6
       
+
       
  inInitrd = config.boot.initrd.supportedFilesystems.f2fs or false;

     

       
8
       
7
       
 
       
in

     

       
9
       
8
       
 
       
{

     

       
10
       
10
       
-
       
  config = mkIf (any (fs: fs == "f2fs") config.boot.supportedFilesystems) {

     

       
9
       
9
       
+
       
  config = mkIf (config.boot.supportedFilesystems.f2fs or false) {

     

       
11
       
10
       
 
       


     

       
12
       
11
       
 
       
    system.fsPackages = [ pkgs.f2fs-tools ];

     

       
13
       
12
       
 
       


     

···

       
3
       
3
       
 
       
with lib;

     

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
{

     

       
6
       
6
       
-
       
  config = mkIf (any (fs: fs == "glusterfs") config.boot.supportedFilesystems) {

     

       
6
       
6
       
+
       
  config = mkIf (config.boot.supportedFilesystems.glusterfs or false) {

     

       
7
       
7
       
 
       


     

       
8
       
8
       
 
       
    system.fsPackages = [ pkgs.glusterfs ];

     

       
9
       
9
       
 
       


     

···

       
3
       
3
       
 
       
with lib;

     

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
let

     

       
6
       
6
       
-
       
  inInitrd = any (fs: fs == "jfs") config.boot.initrd.supportedFilesystems;

     

       
6
       
6
       
+
       
  inInitrd = config.boot.initrd.supportedFilesystems.jfs or false;

     

       
7
       
7
       
 
       
in

     

       
8
       
8
       
 
       
{

     

       
9
       
9
       
-
       
  config = mkIf (any (fs: fs == "jfs") config.boot.supportedFilesystems) {

     

       
9
       
9
       
+
       
  config = mkIf (config.boot.supportedFilesystems.jfs or false) {

     

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
    system.fsPackages = [ pkgs.jfsutils ];

     

       
12
       
12
       
 
       


     

···

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
let

     

       
6
       
6
       
 
       


     

       
7
       
7
       
-
       
  inInitrd = any (fs: fs == "nfs") config.boot.initrd.supportedFilesystems;

     

       
7
       
7
       
+
       
  inInitrd = config.boot.initrd.supportedFilesystems.nfs or false;

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
  nfsStateDir = "/var/lib/nfs";

     

       
10
       
10
       
 
       


     
···

       
58
       
58
       
 
       


     

       
59
       
59
       
 
       
  ###### implementation

     

       
60
       
60
       
 
       


     

       
61
       
61
       
-
       
  config = mkIf (any (fs: fs == "nfs" || fs == "nfs4") config.boot.supportedFilesystems) {

     

       
61
       
61
       
+
       
  config = mkIf (config.boot.supportedFilesystems.nfs or config.boot.supportedFilesystems.nfs4 or false) {

     

       
62
       
62
       
 
       


     

       
63
       
63
       
 
       
    services.rpcbind.enable = true;

     

       
64
       
64
       
 
       


     

···

       
3
       
3
       
 
       
with lib;

     

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
{

     

       
6
       
6
       
-
       
  config = mkIf (any (fs: fs == "ntfs" || fs == "ntfs-3g") config.boot.supportedFilesystems) {

     

       
6
       
6
       
+
       
  config = mkIf (config.boot.supportedFilesystems.ntfs or config.boot.supportedFilesystems.ntfs-3g or false) {

     

       
7
       
7
       
 
       


     

       
8
       
8
       
 
       
    system.fsPackages = [ pkgs.ntfs3g ];

     

       
9
       
9
       
 
       


     

···

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
let

     

       
6
       
6
       
 
       


     

       
7
       
7
       
-
       
  inInitrd = any (fs: fs == "reiserfs") config.boot.initrd.supportedFilesystems;

     

       
7
       
7
       
+
       
  inInitrd = config.boot.initrd.supportedFilesystems.reiserfs or false;

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
in

     

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
{

     

       
12
       
12
       
-
       
  config = mkIf (any (fs: fs == "reiserfs") config.boot.supportedFilesystems) {

     

       
12
       
12
       
+
       
  config = mkIf (config.boot.supportedFilesystems.reiserfs or false) {

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
    system.fsPackages = [ pkgs.reiserfsprogs ];

     

       
15
       
15
       
 
       


     

···

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
let

     

       
4
       
4
       
 
       


     

       
5
       
5
       
-
       
  inInitrd = lib.any (fs: fs == "squashfs") config.boot.initrd.supportedFilesystems;

     

       
5
       
5
       
+
       
  inInitrd = config.boot.initrd.supportedFilesystems.squashfs or false;

     

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
in

     

       
8
       
8
       
 
       


     

···

       
1
       
1
       
 
       
{ config, lib, pkgs, ... }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
{

     

       
4
       
4
       
-
       
  config = lib.mkIf (lib.any (fs: fs == "sshfs" || fs == "fuse.sshfs") config.boot.supportedFilesystems) {

     

       
5
       
5
       
-
       
    system.fsPackages = [ pkgs.sshfs ];

     

       
6
       
6
       
-
       
  };

     

       
4
       
4
       
+
       
  config = lib.mkIf

     

       
5
       
5
       
+
       
    (config.boot.supportedFilesystems.sshfs

     

       
6
       
6
       
+
       
      or config.boot.supportedFilesystems."fuse.sshfs"

     

       
7
       
7
       
+
       
      or false)

     

       
8
       
8
       
+
       
    {

     

       
9
       
9
       
+
       
      system.fsPackages = [ pkgs.sshfs ];

     

       
10
       
10
       
+
       
    };

     

       
7
       
11
       
 
       
}

     

···

       
3
       
3
       
 
       
{

     

       
4
       
4
       
 
       
  config = lib.mkMerge [

     

       
5
       
5
       
 
       


     

       
6
       
6
       
-
       
    (lib.mkIf (lib.any (fs: fs == "unionfs-fuse") config.boot.initrd.supportedFilesystems) {

     

       
6
       
6
       
+
       
    (lib.mkIf (config.boot.initrd.supportedFilesystems.unionfs-fuse or false) {

     

       
7
       
7
       
 
       
      boot.initrd.kernelModules = [ "fuse" ];

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
      boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ''

     
···

       
35
       
35
       
 
       
      };

     

       
36
       
36
       
 
       
    })

     

       
37
       
37
       
 
       


     

       
38
       
38
       
-
       
    (lib.mkIf (lib.any (fs: fs == "unionfs-fuse") config.boot.supportedFilesystems) {

     

       
38
       
38
       
+
       
    (lib.mkIf (config.boot.supportedFilesystems.unionfs-fuse or false) {

     

       
39
       
39
       
 
       
      system.fsPackages = [ pkgs.unionfs-fuse ];

     

       
40
       
40
       
 
       
    })

     

       
41
       
41
       
 
       


     

···

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
let

     

       
6
       
6
       
 
       


     

       
7
       
7
       
-
       
  inInitrd = any (fs: fs == "vboxsf") config.boot.initrd.supportedFilesystems;

     

       
7
       
7
       
+
       
  inInitrd = config.boot.initrd.supportedFilesystems.vboxsf or false;

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
  package = pkgs.runCommand "mount.vboxsf" { preferLocalBuild = true; } ''

     

       
10
       
10
       
 
       
    mkdir -p $out/bin

     
···

       
13
       
13
       
 
       
in

     

       
14
       
14
       
 
       


     

       
15
       
15
       
 
       
{

     

       
16
       
16
       
-
       
  config = mkIf (any (fs: fs == "vboxsf") config.boot.supportedFilesystems) {

     

       
16
       
16
       
+
       
  config = mkIf (config.boot.supportedFilesystems.vboxsf or false) {

     

       
17
       
17
       
 
       


     

       
18
       
18
       
 
       
    system.fsPackages = [ package ];

     

       
19
       
19
       
 
       


     

···

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
let

     

       
6
       
6
       
 
       


     

       
7
       
7
       
-
       
  inInitrd = any (fs: fs == "vfat") config.boot.initrd.supportedFilesystems;

     

       
7
       
7
       
+
       
  inInitrd = config.boot.initrd.supportedFilesystems.vfat or false;

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
in

     

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
{

     

       
12
       
12
       
-
       
  config = mkIf (any (fs: fs == "vfat") config.boot.supportedFilesystems) {

     

       
12
       
12
       
+
       
  config = mkIf (config.boot.supportedFilesystems.vfat or false) {

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
    system.fsPackages = [ pkgs.dosfstools pkgs.mtools ];

     

       
15
       
15
       
 
       


     

···

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
let

     

       
6
       
6
       
 
       


     

       
7
       
7
       
-
       
  inInitrd = any (fs: fs == "xfs") config.boot.initrd.supportedFilesystems;

     

       
7
       
7
       
+
       
  inInitrd = config.boot.initrd.supportedFilesystems.xfs or false;

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
in

     

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
{

     

       
12
       
12
       
-
       
  config = mkIf (any (fs: fs == "xfs") config.boot.supportedFilesystems) {

     

       
12
       
12
       
+
       
  config = mkIf (config.boot.supportedFilesystems.xfs or false) {

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
    system.fsPackages = [ pkgs.xfsprogs.bin ];

     

       
15
       
15
       
 
       


     

···

       
20
       
20
       
 
       
  clevisDatasets = map (e: e.device) (filter (e: e.device != null && (hasAttr e.device config.boot.initrd.clevis.devices) && e.fsType == "zfs" && (fsNeededForBoot e)) config.system.build.fileSystems);

     

       
21
       
21
       
 
       


     

       
22
       
22
       
 
       


     

       
23
       
23
       
-
       
  inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems;

     

       
24
       
24
       
-
       
  inSystem = any (fs: fs == "zfs") config.boot.supportedFilesystems;

     

       
23
       
23
       
+
       
  inInitrd = config.boot.initrd.supportedFilesystems.zfs or false;

     

       
24
       
24
       
+
       
  inSystem = config.boot.supportedFilesystems.zfs or false;

     

       
25
       
25
       
 
       


     

       
26
       
26
       
 
       
  autosnapPkg = pkgs.zfstools.override {

     

       
27
       
27
       
 
       
    zfs = cfgZfs.package;

     

···

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
  crioPackage = pkgs.cri-o.override {

     

       
8
       
8
       
 
       
    extraPackages = cfg.extraPackages

     

       
9
       
9
       
-
       
      ++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package;

     

       
9
       
9
       
+
       
      ++ lib.optional (config.boot.supportedFilesystems.zfs or false) config.boot.zfs.package;

     

       
10
       
10
       
 
       
  };

     

       
11
       
11
       
 
       


     

       
12
       
12
       
 
       
  format = pkgs.formats.toml { };

     

···

       
9
       
9
       
 
       
    extraPackages = cfg.extraPackages

     

       
10
       
10
       
 
       
      # setuid shadow

     

       
11
       
11
       
 
       
      ++ [ "/run/wrappers" ]

     

       
12
       
12
       
-
       
      ++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package;

     

       
12
       
12
       
+
       
      ++ lib.optional (config.boot.supportedFilesystems.zfs or false) config.boot.zfs.package;

     

       
13
       
13
       
 
       
  });

     

       
14
       
14
       
 
       


     

       
15
       
15
       
 
       
  # Provides a fake "docker" binary mapping to podman

     

···

       
526
       
526
       
 
       
            curl

     

       
527
       
527
       
 
       
          ]

     

       
528
       
528
       
 
       
          ++ optionals (bootLoader == "grub") (let

     

       
529
       
529
       
-
       
            zfsSupport = lib.any (x: x == "zfs")

     

       
530
       
530
       
-
       
              (extraInstallerConfig.boot.supportedFilesystems or []);

     

       
529
       
529
       
+
       
            zfsSupport = extraInstallerConfig.boot.supportedFilesystems.zfs or false;

     

       
531
       
530
       
 
       
          in [

     

       
532
       
531
       
 
       
            (pkgs.grub2.override { inherit zfsSupport; })

     

       
533
       
532
       
 
       
            (pkgs.grub2_efi.override { inherit zfsSupport; })