From 91cb7594d018e787b06d504e7ef60eee0cbed138 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Wed, 28 Aug 2024 21:19:12 +0200
Subject: [PATCH] nixos/boot.initrd.clevis: remove `with lib;`

---
 nixos/modules/system/boot/clevis.nix | 37 +++++++++++++---------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/system/boot/clevis.nix b/nixos/modules/system/boot/clevis.nix
index ac881e953576..36328f19e7c6 100644
--- a/nixos/modules/system/boot/clevis.nix
+++ b/nixos/modules/system/boot/clevis.nix
@@ -1,54 +1,51 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
   cfg = config.boot.initrd.clevis;
   systemd = config.boot.initrd.systemd;
   supportedFs = [ "zfs" "bcachefs" ];
 in
 {
-  meta.maintainers = with maintainers; [ julienmalka camillemndn ];
+  meta.maintainers = with lib.maintainers; [ julienmalka camillemndn ];
   meta.doc = ./clevis.md;
 
   options = {
-    boot.initrd.clevis.enable = mkEnableOption "Clevis in initrd";
+    boot.initrd.clevis.enable = lib.mkEnableOption "Clevis in initrd";
 
 
-    boot.initrd.clevis.package = mkOption {
-      type = types.package;
+    boot.initrd.clevis.package = lib.mkOption {
+      type = lib.types.package;
       default = pkgs.clevis;
       defaultText = "pkgs.clevis";
       description = "Clevis package";
     };
 
-    boot.initrd.clevis.devices = mkOption {
+    boot.initrd.clevis.devices = lib.mkOption {
       description = "Encrypted devices that need to be unlocked at boot using Clevis";
       default = { };
-      type = types.attrsOf (types.submodule ({
-        options.secretFile = mkOption {
+      type = lib.types.attrsOf (lib.types.submodule ({
+        options.secretFile = lib.mkOption {
           description = "Clevis JWE file used to decrypt the device at boot, in concert with the chosen pin (one of TPM2, Tang server, or SSS).";
-          type = types.path;
+          type = lib.types.path;
         };
       }));
     };
 
-    boot.initrd.clevis.useTang = mkOption {
+    boot.initrd.clevis.useTang = lib.mkOption {
       description = "Whether the Clevis JWE file used to decrypt the devices uses a Tang server as a pin.";
       default = false;
-      type = types.bool;
+      type = lib.types.bool;
     };
 
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
 
     # Implementation of clevis unlocking for the supported filesystems are located directly in the respective modules.
 
 
-    assertions = (attrValues (mapAttrs
+    assertions = (lib.attrValues (lib.mapAttrs
       (device: _: {
-        assertion = (any (fs: fs.device == device && (elem fs.fsType supportedFs) || (fs.fsType == "zfs" && hasPrefix "${device}/" fs.device)) config.system.build.fileSystems) || (hasAttr device config.boot.initrd.luks.devices);
+        assertion = (lib.any (fs: fs.device == device && (lib.elem fs.fsType supportedFs) || (fs.fsType == "zfs" && lib.hasPrefix "${device}/" fs.device)) config.system.build.fileSystems) || (lib.hasAttr device config.boot.initrd.luks.devices);
         message = ''
           No filesystem or LUKS device with the name ${device} is declared in your configuration.'';
       })
@@ -61,7 +58,7 @@ in
       else [ ];
 
     boot.initrd = {
-      extraUtilsCommands = mkIf (!systemd.enable) ''
+      extraUtilsCommands = lib.mkIf (!systemd.enable) ''
         copy_bin_and_libs ${pkgs.jose}/bin/jose
         copy_bin_and_libs ${pkgs.curl}/bin/curl
         copy_bin_and_libs ${pkgs.bash}/bin/bash
@@ -84,15 +81,15 @@ in
         sed -i $out/bin/clevis-decrypt-tpm2 -e 's,tpm2_,tpm2 ,'
       '';
 
-      secrets = lib.mapAttrs' (name: value: nameValuePair "/etc/clevis/${name}.jwe" value.secretFile) cfg.devices;
+      secrets = lib.mapAttrs' (name: value: lib.nameValuePair "/etc/clevis/${name}.jwe" value.secretFile) cfg.devices;
 
       systemd = {
-        extraBin = mkIf systemd.enable {
+        extraBin = lib.mkIf systemd.enable {
           clevis = "${cfg.package}/bin/clevis";
           curl = "${pkgs.curl}/bin/curl";
         };
 
-        storePaths = mkIf systemd.enable [
+        storePaths = lib.mkIf systemd.enable [
           cfg.package
           "${pkgs.jose}/bin/jose"
           "${pkgs.curl}/bin/curl"