diff --git a/hosts/apollo/boot.nix b/hosts/apollo/boot.nix index a6d9d33..2560f94 100644 --- a/hosts/apollo/boot.nix +++ b/hosts/apollo/boot.nix @@ -1,10 +1,9 @@ { pkgs, lib, inputs, ... }: { - boot.kernelParams = [ "rd.luks.options=timeout=0,tries=1" ]; boot.initrd = { supportedFilesystems = [ "ext4" "zfs" ]; - availableKernelModules = [ "hid_apple" "igc" ]; + availableKernelModules = [ "hid_apple" ]; systemd = { enable = true; fido2.enable = true; @@ -25,33 +24,11 @@ crypttabExtraOpts = [ "fido2-device=auto" ]; }; - systemd.services."systemd-cryptsetup@" = { - overrideStrategy = "asDropin"; - serviceConfig = { - Restart = "no"; - OnFailureJobMode = "fail"; - }; - }; - systemd.services."zfs-import-nix-root" = { wants = [ "keys.mount" ]; after = [ "keys.mount" ]; }; - network = { - enable = true; - ssh = { - enable = true; - port = 2222; - hostKeys = [ "/etc/secrets/initrd/ssh_host_ed25519_key" ]; - - # Use an inline string to prepend the forced systemd command to your key - authorizedKeys = [ - ''command="${pkgs.systemd}/bin/systemd-tty-ask-password-agent --watch" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIjed9TzAaS6afEilS6CQAyz7DRJUNeLWGeboB3Ma3Rb remote-fido-unlock'' - ]; - }; - }; - }; systemd.services."zfs-import-nix-main" = {