From 58e05d16d771614f061e46a7afb77e98fcdc4c75 Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Wed, 20 May 2026 18:41:44 +0800
Subject: [PATCH] aerospace: skip config reload when AeroSpace is not running

Avoid failing Home Manager activation when the generated AeroSpace
configuration changes while AeroSpace is not yet running.

The onChange hook can run before a running AeroSpace instance is
available. Probe the running instance with `aerospace list-modes --current`
before calling `reload-config`, and skip the reload if AeroSpace is not
yet running.
---
 modules/programs/aerospace.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/programs/aerospace.nix b/modules/programs/aerospace.nix
index e448baab9..88067aa93 100644
--- a/modules/programs/aerospace.nix
+++ b/modules/programs/aerospace.nix
@@ -208,7 +208,11 @@ in
 
         onChange = lib.mkIf cfg.launchd.enable ''
           echo "AeroSpace config changed, reloading..."
-          ${lib.getExe cfg.package} reload-config
+          if ${lib.getExe cfg.package} list-modes --current >/dev/null 2>&1; then
+            ${lib.getExe cfg.package} reload-config
+          else
+            echo "AeroSpace is not running yet, skipping reload-config."
+          fi
         '';
       };
     };