Unverified Commit 0adbda28 authored by Madoura's avatar Madoura
Browse files

nixos/bcachefs: remove 'with lib;'

parent edd51371

nixos/modules/tasks/filesystems/bcachefs.nix

+5 −7
Original line number Diff line number Diff line 
{ config, lib, pkgs, utils, ... }:



with lib;



let



  bootFs = filterAttrs (n: fs: (fs.fsType == "bcachefs") && (utils.fsNeededForBoot fs)) config.fileSystems;

  bootFs = lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (utils.fsNeededForBoot fs)) config.fileSystems;



  commonFunctions = ''

    prompt() {
@@ -56,7 +54,7 @@ let 
  # remove this adaptation when bcachefs implements mounting by filesystem uuid

  # also, implement automatic waiting for the constituent devices when that happens

  # bcachefs does not support mounting devices with colons in the path, ergo we don't (see #49671)

  firstDevice = fs: head (splitString ":" fs.device);

  firstDevice = fs: lib.head (lib.splitString ":" fs.device);



  openCommand = name: fs: ''

    tryUnlock ${name} ${firstDevice fs}
@@ -93,7 +91,7 @@ let 
in



{

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

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

    {

      # needed for systemd-remount-fs

      system.fsPackages = [ pkgs.bcachefs-tools ];
@@ -105,7 +103,7 @@ in 
      systemd.services = lib.mapAttrs' (mkUnits "") (lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems);

    }



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

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

      # chacha20 and poly1305 are required only for decryption attempts

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

      boot.initrd.systemd.extraBin = {
@@ -121,7 +119,7 @@ in 
        $out/bin/bcachefs version

      '';



      boot.initrd.postDeviceCommands = lib.mkIf (!config.boot.initrd.systemd.enable) (commonFunctions + concatStrings (mapAttrsToList openCommand bootFs));

      boot.initrd.postDeviceCommands = lib.mkIf (!config.boot.initrd.systemd.enable) (commonFunctions + lib.concatStrings (lib.mapAttrsToList openCommand bootFs));



      boot.initrd.systemd.services = lib.mapAttrs' (mkUnits "/sysroot") bootFs;

    })