flk

modules/desktop.nix

@@ -8,7 +8,14 @@
 	in {
 		programs.aerospace = {
 			enable = true;
-			package = pkgs.emptyDirectory;
+			package =
+				pkgs.emptyDirectory.overrideAttrs (old: {
+						meta =
+							(old.meta or {})
+							// {
+								mainProgram = "aerospace";
+							};
+					});
 			launchd.enable = true;
 			settings = {
 				start-at-login = true;

modules/overlays.nix

@@ -2,6 +2,17 @@
 	overlays = [
 		# himalaya
 		(import ./_overlays/himalaya.nix {inherit inputs;})
+		# direnv (darwin upstream makefile forces external linking)
+		(final: prev: {
+				direnv =
+					prev.direnv.overrideAttrs (old: {
+							env =
+								(old.env or {})
+								// final.lib.optionalAttrs final.stdenv.isDarwin {
+									CGO_ENABLED = 1;
+								};
+						});
+			})
 		# ast-grep (test_scan_invalid_rule_id fails on darwin in sandbox)
 		(import ./_overlays/ast-grep.nix {inherit inputs;})
 		# jj-ryu