steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

fixup! support unencrypted disk provisioning

Browse source
This commit is contained in:
steveej 2021-01-04 10:55:36 +01:00
parent d742a504f0
commit fe76636775
5 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
nix/os/devices/default.nix
View file

@ -4,17 +4,17 @@
, gitRoot ? "$(git rev-parse --show-toplevel)" , gitRoot ? "$(git rev-parse --show-toplevel)"
# FIXME: why do these need explicit mentioning? # FIXME: why do these need explicit mentioning?
, moreargs ? null # , moreargs ? ""
, rebuildarg ? "" # , rebuildarg ? ""
, ... , ...
} @ args : } @ args :
let let
rebuildargsSudo = [ "switch" "boot" ]; rebuildargsSudo = [ "switch" "boot" ];
rebuild = { rebuild = {
rebuildarg gitRoot
, gitRoot , rebuildarg ? "dry-activate"
, moreargs ? null , moreargs ? ""
, ... , ...
}: pkgs.writeScript "script" '' }: pkgs.writeScript "script" ''
@ -27,7 +27,7 @@ let
[[ -e "''${NIXOS_CONFIG}" ]] [[ -e "''${NIXOS_CONFIG}" ]]
${if (builtins.elem rebuildarg rebuildargsSudo) ${if (builtins.elem rebuildarg rebuildargsSudo)
&& builtins.match ".*--target-host.*" moreargs == null && (builtins.match ".*--target-host.*" moreargs) == null
then then
"sudo -E \\" "sudo -E \\"
else else
@ -42,7 +42,12 @@ let
in { in {
recipes = { recipes = {
rebuild = rebuild { inherit gitRoot; inherit (args) rebuildarg moreargs; }; rebuild = rebuild {
inherit gitRoot;
}
# // pkgs.lib.attrsets.optionalAttrs (moreargs != "") { inherit moreargs; }
# // pkgs.lib.attrsets.optionalAttrs (rebuildarg != "") { inherit rebuildarg; }
;
} // (import ./disk.nix (args // { inherit pkgs ownLib gitRoot; })) } // (import ./disk.nix (args // { inherit pkgs ownLib gitRoot; }))
; ;
} }

6
nix/os/devices/steveej-rmvbl-sdep0/hw.nix
View file

@ -2,8 +2,6 @@
{ {
# TASK: new device # TASK: new device
hardware.encryptedDisk = { hardware.opinionatedDisk.diskId = "usb-SanDisk_Extreme_Pro_12345978EC62-0:0";
enable = true; hardware.opinionatedDisk.encrypted = true;
diskId = "usb-SanDisk_Extreme_Pro_12345978EC62-0:0";
};
} }

2
nix/os/devices/steveej-t14/configuration.nix
View file

@ -4,7 +4,7 @@
imports = [ imports = [
../../profiles/common/configuration.nix ../../profiles/common/configuration.nix
../../profiles/graphical/configuration.nix ../../profiles/graphical/configuration.nix
../../modules/opnionatedDisk.nix ../../modules/opinionatedDisk.nix
./system.nix ./system.nix
./hw.nix ./hw.nix

2
nix/os/devices/steveej-t14/hw.nix
View file

@ -18,7 +18,7 @@ let
in in
{ {
# TASK: new device # TASK: new device
hardware.encryptedDisk = { hardware.opinionatedDisk = {
enable = true; enable = true;
encrypted = true; encrypted = true;
diskId = "nvme-SKHynix_HFS001TD9TNI-L2B0B_CJ0AN89731030AV3Q"; diskId = "nvme-SKHynix_HFS001TD9TNI-L2B0B_CJ0AN89731030AV3Q";

3
nix/os/profiles/removable-medium/hw.nix
View file

@ -1,7 +1,6 @@
{ ... }: { ... }:
{ {
hardware.opnionatedDisk.enable = true; hardware.opinionatedDisk.enable = true;
hardware.opnionatedDisk.encrypted = true;
hardware.enableAllFirmware = true; hardware.enableAllFirmware = true;
} }