run formatter

This commit is contained in:
chaos 2024-03-10 18:29:49 +00:00
parent dd4bc277d1
commit 937a5df23f
No known key found for this signature in database
5 changed files with 187 additions and 180 deletions

View file

@ -5,7 +5,8 @@
writeShellApplication,
}: let
encryptedUSBData = import ../data/drives/encryptedUSB.nix;
in writeShellApplication {
in
writeShellApplication {
name = "mk-enc-usb";
runtimeInputs = [
parted
@ -48,4 +49,4 @@ in writeShellApplication {
echo "Naming Partitions"
parted "$USB_DEVICE" -- name 1 ${encryptedUSBData.encryptedPartLabel}
'';
}
}

View file

@ -6,7 +6,8 @@
writeShellApplication,
}: let
driveData = import ../data/drives/encryptedDrive.nix;
in writeShellApplication {
in
writeShellApplication {
name = "mk-encrypted-drive";
runtimeInputs = [
parted
@ -82,4 +83,4 @@ in writeShellApplication {
echo "mount /dev/mapper/mk_encrypted_drive to install"
'';
}
}

View file

@ -5,7 +5,8 @@
writeShellApplication,
}: let
externalDriveData = import ../data/drives/raspberryExternalDrive.nix;
in writeShellApplication {
in
writeShellApplication {
name = "mk-raspberry-ext-drive";
runtimeInputs = [
util-linux
@ -64,4 +65,4 @@ in writeShellApplication {
echo "Closing mapper device"
cryptsetup close "mk-raspberry-ext-drive"
'';
}
}

View file

@ -306,7 +306,8 @@ in rec {
then "secrets-init"
else "secrets-init-${name}";
scripts = genScripts cfg;
in writeShellApplication {
in
writeShellApplication {
name = scriptName;
runtimeInputs = defaultPackages ++ cfg.packages;
text = scripts.initScript;
@ -319,7 +320,8 @@ in rec {
then "secrets-check"
else "secrets-check-${name}";
scripts = genScripts cfg;
in writeShellApplication {
in
writeShellApplication {
name = scriptName;
runtimeInputs = defaultPackages ++ cfg.checkPackages;
text = scripts.checkScript;
@ -344,7 +346,8 @@ in rec {
capabilities = [${concatStringsSep "," (forEach capabilities escapeString)}]
}
'');
in toFile "vault-policy-${name}.hcl" ''
in
toFile "vault-policy-${name}.hcl" ''
${concatStringsSep "\n" policies}
'';
}

View file

@ -202,7 +202,8 @@ in
(mergeAttrsList (forEach machinesWithContainers (machineName: let
machine = machines.${machineName};
inherit (machine) containers;
in mergeAttrsList (forEach containers (containerName: {
in
mergeAttrsList (forEach containers (containerName: {
"secrets-init-${machineName}-container-${containerName}" = secretsInitScriptForContainer machineName containerName;
"vault-policy-${machineName}-container-${containerName}" = vaultPolicyForContainer machineName containerName;
})))))