diff --git a/flake.lock b/flake.lock index 3df6b80..0fa9e0b 100644 --- a/flake.lock +++ b/flake.lock @@ -191,11 +191,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1774163246, - "narHash": "sha256-gzlqyLjP44LWraUd3Zn4xrQKOtK+zcBJ77pnsSUsxcM=", + "lastModified": 1774250935, + "narHash": "sha256-mWID0WFgTnd9hbEeaPNX+YYWF70JN3r7zBouEqERJOE=", "owner": "nix-community", "repo": "fenix", - "rev": "4cd28929c68cae521589bc21958d3793904ed1e2", + "rev": "64d7705e8c37d650cfb1aa99c24a8ce46597f29e", "type": "github" }, "original": { @@ -441,11 +441,11 @@ ] }, "locked": { - "lastModified": 1774210133, - "narHash": "sha256-yeiWCY9aAUUJ3ebMVjs0UZXRnT5x90MCtpbpOWiXrvM=", + "lastModified": 1774293042, + "narHash": "sha256-OEBV+Y5I4Ldu98k0KvGXRfJYh+jjE8ocCSL/dxTGs1s=", "owner": "nix-community", "repo": "home-manager", - "rev": "c6fe2944ad9f2444b2d767c4a5edee7c166e8a95", + "rev": "bc357c75e3142a31b849ba49c5299fb52c61cf59", "type": "github" }, "original": { @@ -457,11 +457,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1774249610, - "narHash": "sha256-MdzRhOIH5t7pBRFXNsR/aKQzUkFkK8Oon4Fqc+j3jPo=", + "lastModified": 1774294203, + "narHash": "sha256-s8oUPYIkF4JGCGhfQgfVf/LwlIJiCnza5FbGuHzEuYU=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "742a8f2af8676cca52cfc5753dbce6c0cfee519f", + "rev": "d1c95a8e5a66a1bf1453577e5ff050c9bc26fa48", "type": "github" }, "original": { @@ -473,11 +473,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1774249283, - "narHash": "sha256-B3L1YpysszVUEg9wqj+B8SNpGUHcfYWlrLD1GQC40E8=", + "lastModified": 1774294431, + "narHash": "sha256-pc4lRV8vz7ixbgAfj+KOJlsJtGBhYV2xZPe3t7weA/o=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "e9db20c2b64def74b5fbbed530ee8436878c9721", + "rev": "dbc9371db7ad629f8184407efea3b87b20f87db8", "type": "github" }, "original": { @@ -593,11 +593,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1774237443, - "narHash": "sha256-4h/vWMOCvd0s5WK7DONqlljImbbKG55gmnVfBcxcFoY=", + "lastModified": 1774286543, + "narHash": "sha256-p/uG7RgY9JfE7YUgDHZ1FlHONpoPuPIb+PwOEdcPBRE=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "d17f058f96e7993b50879e871a742b3ed9a5f429", + "rev": "94da705b8baa5c78d39e8c092bccfbe3a015b8de", "type": "github" }, "original": { @@ -750,11 +750,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1774249382, - "narHash": "sha256-OsvVvcOQFbkOJV9y8Fy8xLmXl+UDw1SEm/hZjTGSI2Q=", + "lastModified": 1774294110, + "narHash": "sha256-5n0qlcCumjXk4wW+QTMmt2jW5CGGRFtlTR2AP+jfEyc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a50eb242f5449d99c3b44dfb5b0eac6fc38807f", + "rev": "2a326c4bc0987aad1b93a5bd652e169fe9546cc0", "type": "github" }, "original": { @@ -819,11 +819,11 @@ "pi-agent-stuff": { "flake": false, "locked": { - "lastModified": 1774133374, - "narHash": "sha256-pqGu+lTpqwp98Xckb6yRDEDiB4Gz+f6c15zxmT8Fv2U=", + "lastModified": 1774288055, + "narHash": "sha256-VZFa3PCOYM3Iz8b+TXPTnQDHNpRK5wvkateuQz0lu0E=", "owner": "mitsuhiko", "repo": "agent-stuff", - "rev": "f0f29f95a03a3d4e00b6aaefabcef702e81c1719", + "rev": "7ca2deb75f4a1853bad7d93416c72838080c5e55", "type": "github" }, "original": { @@ -851,11 +851,11 @@ "pi-harness": { "flake": false, "locked": { - "lastModified": 1774210293, - "narHash": "sha256-YzQn5r5KAORu6FI7dIkKWTU5f/HYinYu7i8QwPKCYik=", + "lastModified": 1774276819, + "narHash": "sha256-BrbgnFFd4GHJhKa0MuaT2o/LvwLf4GXPbJi6j3H9AHk=", "owner": "aliou", "repo": "pi-harness", - "rev": "720db4f57cafd732953fae14ecb5eb50ff4d808c", + "rev": "5bbf0cd6d6ee35d978ca32a070d9d53fbbfe2571", "type": "github" }, "original": { @@ -954,11 +954,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1774097238, - "narHash": "sha256-hcujm/qEX4RUybdBCrQKdQNqTRYDItmnbjJRP5ky5vc=", + "lastModified": 1774221325, + "narHash": "sha256-aEIdkqB8gtQZtEbogdUb5iyfcZpKIlD3FkG8ANu73/I=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "76de1de27c0ca1329bc41324edab22c82d69e779", + "rev": "b42b63f390a4dab14e6efa34a70e67f5b087cc62", "type": "github" }, "original": { diff --git a/modules/desktop.nix b/modules/desktop.nix index fe0ccc8..06d2b3e 100644 --- a/modules/desktop.nix +++ b/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; diff --git a/modules/overlays.nix b/modules/overlays.nix index afb3085..ac9e63a 100644 --- a/modules/overlays.nix +++ b/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