From 288289d6cecc91f2f4c3e384e8dde776fa2ca291 Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Wed, 16 Apr 2025 22:34:25 +0200
Subject: [PATCH] flake.nix: cleanup

---
 flake.nix | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/flake.nix b/flake.nix
index 28699fc..c7f8c3d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,21 +13,23 @@
       })
       pkgsFor;
 
-    formatter.x86_64-linux = inputs.nixpkgs.legacyPackages.x86_64-linux.alejandra;
+    formatter = eachSystem (system: pkgsFor.${system}.alejandra);
 
-    packages = eachSystem (
-      system: {
-        inherit
-          (import ./packages rec {
-            pkgs = pkgsFor.${system};
-            helix = inputs.helix.packages.${pkgs.system}.default;
-          })
-          fish
-          wrapped-helix
-          kakoune
-          ;
-      }
-    );
+    packages =
+      lib.mapAttrs (
+        system: pkgs: {
+          inherit
+            (import ./packages rec {
+              inherit pkgs;
+              helix = inputs.helix.packages.${system}.default;
+            })
+            fish
+            wrapped-helix
+            kakoune
+            ;
+        }
+      )
+      pkgsFor;
 
     apps = eachSystem (system: let
       inherit (inputs.self.packages.${system}) fish wrapped-helix;