chaos/nixfiles
1
0
Fork 0
Code Issues 2 Releases Activity

run formatter

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
extras/mk-enc-usb.nix
View file

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

5
extras/mk-encrypted-drive.nix
View file

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

5
extras/mk-raspberry-ext-drive.nix
View file

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

9
modules/nixos/secretsLib/lib.nix
View file

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

3
outputs.nix
View file

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