From 0ae4d84ca2d26cfe9149bc9ae8b3b69021db5767 Mon Sep 17 00:00:00 2001
From: John Ogle <johno@squareup.com>
Date: Fri, 5 Dec 2025 14:13:05 -0800
Subject: [PATCH] Simplify aerospace launchd config and remove menu bar hiding

- Remove menu bar hiding code (no longer needed for SketchyBar)
- Use built-in programs.aerospace.launchd.enable instead of custom agent
- Remove redundant launchd.agents.aerospace configuration block
---
 home/roles/aerospace/default.nix | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/home/roles/aerospace/default.nix b/home/roles/aerospace/default.nix
index b638cea..a8bec0b 100644
--- a/home/roles/aerospace/default.nix
+++ b/home/roles/aerospace/default.nix
@@ -169,15 +169,6 @@ in
           "Redo" = "@$z";   # Cmd+Shift+Z
         };
       })
-
-      # Hide macOS menu bar when SketchyBar is enabled
-      # Note: Requires logout/login to take effect
-      (mkIf cfg.sketchybar.enable {
-        NSGlobalDomain = {
-          _HIHideMenuBar = true;
-          AppleMenuBarVisibleInFullscreen = false;
-        };
-      })
     ];
 
     # Install aerospace package and optional tools if enabled
@@ -187,6 +178,7 @@ in
 
     # Enable and configure aerospace
     programs.aerospace.enable = true;
+    programs.aerospace.launchd.enable = cfg.launchd.enable;
     programs.aerospace.userSettings = mkMerge [
       # Default configuration with leader key substitution
       {
@@ -315,18 +307,6 @@ in
       cfg.userSettings
     ];
 
-    # Launchd agent for auto-starting aerospace
-    launchd.agents.aerospace = mkIf cfg.launchd.enable {
-      enable = true;
-      config = {
-        Program = "${pkgs.aerospace}/Applications/AeroSpace.app/Contents/MacOS/AeroSpace";
-        RunAtLoad = true;
-        KeepAlive = true;
-        StandardOutPath = "/tmp/aerospace.log";
-        StandardErrorPath = "/tmp/aerospace.err.log";
-      };
-    };
-
     # Launchd agent for autoraise
     launchd.agents.autoraise = mkIf cfg.autoraise.enable {
       enable = true;