From d3a5ba794e64d15f157f8db3215fa009fe4322f2 Mon Sep 17 00:00:00 2001 From: Noah Pederson Date: Tue, 14 Jul 2026 13:51:56 -0500 Subject: [PATCH] Fix silently failing nixos-rebuild switch --- modules/copy-nix-store-to-misaki.nix | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/modules/copy-nix-store-to-misaki.nix b/modules/copy-nix-store-to-misaki.nix index a71febb..ef9ec2f 100644 --- a/modules/copy-nix-store-to-misaki.nix +++ b/modules/copy-nix-store-to-misaki.nix @@ -11,17 +11,15 @@ in system.activationScripts.copyNixStoreToMisaki = { deps = [ "users" ]; text = '' - if [ "${config.networking.hostName}" = "misaki" ]; then - exit 0 - fi - - if ${pkgs.coreutils}/bin/id -u noah >/dev/null 2>&1; then - if ! ${pkgs.util-linux}/bin/runuser -u noah -- ${copyScript} --all; then - echo "warning: failed to copy local Nix store objects to Misaki" >&2 - fi - else - if ! ${copyScript} --all; then - echo "warning: failed to copy local Nix store objects to Misaki" >&2 + if [ "${config.networking.hostName}" != "misaki" ]; then + if ${pkgs.coreutils}/bin/id -u noah >/dev/null 2>&1; then + if ! ${pkgs.util-linux}/bin/runuser -u noah -- ${copyScript} --all; then + echo "warning: failed to copy local Nix store objects to Misaki" >&2 + fi + else + if ! ${copyScript} --all; then + echo "warning: failed to copy local Nix store objects to Misaki" >&2 + fi fi fi ''; -- 2.51.2