diff --git a/nixos/module/hectic/archetype/dev.nix b/nixos/module/hectic/archetype/dev.nix index d1f772d..b5cee69 100644 --- a/nixos/module/hectic/archetype/dev.nix +++ b/nixos/module/hectic/archetype/dev.nix @@ -58,5 +58,14 @@ in { htop-vim ]); }; + + # Adjust zsh prompt for dev archetype: show '#' instead of '%' + home-manager.sharedModules = lib.mkAfter [ + { + programs.zsh.initExtra = lib.mkAfter '' + PROMPT="# %~ " + ''; + } + ]; }; } diff --git a/package/deploy/deploy.sh b/package/deploy/deploy.sh index 8cee259..1cb6cb6 100644 --- a/package/deploy/deploy.sh +++ b/package/deploy/deploy.sh @@ -196,8 +196,14 @@ if [ "${push_deploy+x}" ]; then # shellcheck disable=SC2068 nixos-anywhere -- $@ # --flake .#x86_64-linux --target-host proxydoe + + log info "waiting for $target_host to become reachable via ssh..." + while ! puressh "$target_host" true 2>/dev/null; do + sleep 5 + done server_public_age_key=$(puressh "$target_host" cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age) + # shellcheck disable=SC2016 log info 'server'"'"'s public age key is `%s` use it in sops file and run regular deploys' "$server_public_age_key"