diff --git a/modules/workstation-setup.nix b/modules/workstation-setup.nix index a2387ef..56ec0f2 100644 --- a/modules/workstation-setup.nix +++ b/modules/workstation-setup.nix @@ -291,7 +291,7 @@ let workstationSetup = pkgs.stdenv.mkDerivation { pname = "nixos-workstations-setup"; - version = "1.8.7"; + version = "1.9.1"; src = ../workstation-setup; @@ -328,8 +328,11 @@ let password_marker="$state_dir/password-initialized" pin_marker="$state_dir/yubikey-pin-created" fido_marker="$state_dir/yubikey-fido-enrolled" + yubikey_skipped_marker="$state_dir/yubikey-skipped" - if [ -e "$password_marker" ] && [ -e "$pin_marker" ] && [ -e "$fido_marker" ]; then + if [ -e "$password_marker" ] && { + [ -e "$yubikey_skipped_marker" ] || { [ -e "$pin_marker" ] && [ -e "$fido_marker" ]; } + }; then exit 0 fi @@ -347,7 +350,6 @@ in user = lib.mkOption { type = lib.types.str; - default = "alice"; description = "Utilisateur devant finaliser son authentification."; }; };