zaphyra's git: nixfiles

default.nix: some refactoring

diff --git a/default.nix b/default.nix
@@ -1,4 +1,6 @@
 let
+  defaultSystem = if (builtins ? currentSystem) then builtins.currentSystem else "x86_64-linux";
+
   npins = import ./npins;
   overlays = import ./overlays { inherit npins; };
   nixosConfigurations = import ./machines { inherit lib npins; };

@@ -14,7 +16,6 @@ let
 in
 {
 
-  self = import ./.;
   outPath = ./.;
 
   inherit

@@ -24,36 +25,46 @@ in
     nixosConfigurations
     ;
 
-  formatter = lib.zpha.forAllSystems {
-    inherit (npins) nixpkgs;
-    body = pkgs: pkgs.nixfmt;
-  };
-
   nixosModules = import ./nixosModules { inherit lib; };
 
-  packages = lib.zpha.forAllSystems {
-    overlays = overlays.default;
-    body =
-      pkgs:
+  formatter =
+    {
+      system ? defaultSystem,
+    }:
+    (import npins.nixpkgs {
+      inherit system;
+    }).nixfmt;
+
+  packages =
+    {
+      system ? defaultSystem,
+    }:
+    let
+      pkgs = import npins.nixpkgs {
+        inherit system;
+        overlays = overlays.default;
+      };
+    in
+    (
       (import ./packages pkgs)
       // (builtins.listToAttrs (
         lib.flatten [
           (lib.flip lib.mapAttrsToList nixosConfigurations (
-            machineName: nixosConfiguration: [
-              (lib.nameValuePair "deploySystem-${machineName}" (
-                pkgs.zpha.deploySystem.override {
-                  systemConfig = nixosConfiguration.config;
-                }
-              ))
-              (lib.nameValuePair "setupDisk-${machineName}" (
-                pkgs.zpha.setupDisk.override {
+            machineName: nixosConfiguration:
+            (
+              let
+                attrs = {
                   systemConfig = nixosConfiguration.config;
-                }
-              ))
-            ]
+                };
+              in
+              [
+                (lib.nameValuePair "deploySystem-${machineName}" (pkgs.zpha.deploySystem.override attrs))
+                (lib.nameValuePair "setupDisk-${machineName}" (pkgs.zpha.setupDisk.override attrs))
+              ]
+            )
           ))
         ]
-      ));
-  };
+      ))
+    );
 
 }

diff --git a/flake.nix b/flake.nix
@@ -1 +1,30 @@
-{ outputs = _: import ./.; }
+{
+  outputs =
+    _:
+    let
+      systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+      ];
+      defaultNix = import ./.;
+      packagesForSystems = builtins.listToAttrs (
+        map (system: {
+          name = system;
+          value = defaultNix.packages { inherit system; };
+        }) systems
+      );
+      formatterForSystems = builtins.listToAttrs (
+        map (system: {
+          name = system;
+          value = defaultNix.formatter { inherit system; };
+        }) systems
+      );
+    in
+    builtins.mapAttrs (
+      name: value:
+      if name == "packages" then
+        packagesForSystems
+      else
+        (if name == "formatter" then formatterForSystems else value)
+    ) defaultNix;
+}