From 93331e06f3f688f87144654a0ac9aaed7e83b959 Mon Sep 17 00:00:00 2001
From: sid <sid@sid.ovh>
Date: Sun, 10 May 2026 17:27:19 +0200
Subject: [PATCH] flake: new forAllSystems

---
 flake.nix | 77 +++++++++++++++++++++++++------------------------------
 1 file changed, 35 insertions(+), 42 deletions(-)

diff --git a/flake.nix b/flake.nix
index 349d6ad..fa8c5ab 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,13 +22,13 @@
     let
       inherit (self) outputs;
 
-      supportedSystems = [
-        "x86_64-linux"
+      systems = [
+        "aarch64-darwin"
         "aarch64-linux"
+        "x86_64-darwin"
+        "x86_64-linux"
       ];
 
-      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
-
       lib = nixpkgs.lib.extend (final: prev: inputs.synix.lib or { });
 
       mkNixosConfiguration =
@@ -39,9 +39,21 @@
             inherit inputs outputs lib;
           };
         };
+
+      forAllSystems =
+        function:
+        lib.genAttrs systems (
+          system:
+          function (
+            import nixpkgs {
+              inherit system;
+              overlays = [ self.overlays.modifications ];
+            }
+          )
+        );
     in
     {
-      packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
+      packages = forAllSystems (pkgs: import ./pkgs pkgs);
 
       overlays = import ./overlays { inherit inputs; };
 
@@ -51,24 +63,16 @@
         ess-helm = mkNixosConfiguration "x86_64-linux" [ ./hosts/ess-helm ];
       };
 
-      devShells = forAllSystems (
-        system:
-        let
-          pkgs = nixpkgs.legacyPackages.${system};
-        in
-        {
-          default = pkgs.mkShell {
-            shellHook = "export FLAKE_PATH=$(pwd)";
-          };
-        }
-      );
+      devShells = forAllSystems (pkgs: {
+        default = pkgs.mkShell {
+          shellHook = "export FLAKE_PATH=$(pwd)";
+        };
+      });
 
       formatter = forAllSystems (
-        system:
+        pkgs:
         let
-          pkgs = nixpkgs.legacyPackages.${system};
-          config = self.checks.${system}.pre-commit-check.config;
-          inherit (config) package configFile;
+          inherit (self.checks.${pkgs.system}.pre-commit-check.config) package configFile;
           script = ''
             ${pkgs.lib.getExe package} run --all-files --config ${configFile}
           '';
@@ -76,28 +80,17 @@
         pkgs.writeShellScriptBin "pre-commit-run" script
       );
 
-      checks = forAllSystems (
-        system:
-        let
-          pkgs = nixpkgs.legacyPackages.${system};
-          flakePkgs = self.packages.${system};
-          overlaidPkgs = import nixpkgs {
-            inherit system;
-            overlays = [ self.overlays.modifications ];
+      checks = forAllSystems (pkgs: {
+        pre-commit-check = inputs.git-hooks.lib.${pkgs.system}.run {
+          src = ./.;
+          hooks = {
+            nixfmt.enable = true;
           };
-        in
-        {
-          pre-commit-check = inputs.git-hooks.lib.${system}.run {
-            src = ./.;
-            hooks = {
-              nixfmt.enable = true;
-            };
-          };
-          build-packages = pkgs.linkFarm "flake-packages-${system}" flakePkgs;
-          build-overlays = pkgs.linkFarm "flake-overlays-${system}" {
-            # package = overlaidPkgs.package;
-          };
-        }
-      );
+        };
+        build-packages = pkgs.linkFarm "flake-packages-${pkgs.system}" self.packages.${pkgs.system};
+        build-overlayed-packages = pkgs.linkFarm "flake-overlayed-packages-${pkgs.system}" (
+          self.overlays.modifications pkgs pkgs
+        );
+      });
     };
 }