From 3390c39901a18b73a6f45b70911aac2c96c48c0b Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@hoyer.xyz>
Date: Mon, 25 Nov 2024 16:00:27 +0100
Subject: [PATCH] Update masApps and add Homebrew shell initialization

Convert masApps from list to set for better structure consistency. Add initialization for Homebrew in the Fish shell to ensure the environment is correctly set up.
---
 modules/darwin/system/homebrew/default.nix | 3 +++
 systems/aarch64-darwin/m4/default.nix      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/darwin/system/homebrew/default.nix b/modules/darwin/system/homebrew/default.nix
index 77f0d86..7752d06 100644
--- a/modules/darwin/system/homebrew/default.nix
+++ b/modules/darwin/system/homebrew/default.nix
@@ -39,5 +39,8 @@ in
       # With mutableTaps disabled, taps can no longer be added imperatively with `brew tap`.
       mutableTaps = false;
     };
+    programs.fish.shellInit = ''
+      /opt/homebrew/bin/brew shellenv | source
+    '';
   };
 }
diff --git a/systems/aarch64-darwin/m4/default.nix b/systems/aarch64-darwin/m4/default.nix
index a402f6f..1099a0c 100644
--- a/systems/aarch64-darwin/m4/default.nix
+++ b/systems/aarch64-darwin/m4/default.nix
@@ -9,7 +9,7 @@ with lib.metacfg;
       "libusb"
       "mas"
     ];
-    masApps = [ ];
+    masApps = { };
   };
 
   metacfg = {