From f3b09cb54f30d73426b77670685a5a92d555db59 Mon Sep 17 00:00:00 2001
From: Emile Clark-Boman <emile@agribit.com.au>
Date: Sat, 13 Dec 2025 13:15:04 +1000
Subject: [PATCH] migrate towards github:nix-systems instead

---
 nib/sys/default.nix | 37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/nib/sys/default.nix b/nib/sys/default.nix
index 060b838..4b63863 100644
--- a/nib/sys/default.nix
+++ b/nib/sys/default.nix
@@ -1,21 +1,26 @@
-{lib, ...}: let
-  # XXX: TODO: Move these helper functions into their own modules
-  listToTrivialAttrs = values:
-    builtins.listToAttrs (builtins.map (x: {
-        name = x;
-        value = x;
-      })
-      values);
+{
+  crossLists,
+  listToAttrsIdentity,
+  ...
+}: let
+  # === Internal Helper Functions ===
+  toSystemName = arch: platform: "${arch}-${platform}";
+  listsToSystemNames = archs: platforms:
+    crossLists (arch: platform: toSystemName arch platform)
+    [
+      (builtins.attrValues archs)
+      (builtins.attrValues platforms)
+    ];
 in rec {
   # REF: https://github.com/nix-systems/nix-systems
-  archs = listToTrivialAttrs [
+  archs = listToAttrsIdentity [
     "x86_64"
     "aarch64"
     "riscv64"
   ];
 
   # REF: https://github.com/nix-systems/nix-systems
-  platforms = listToTrivialAttrs [
+  platforms = listToAttrsIdentity [
     "linux"
     "darwin"
   ];
@@ -35,16 +40,4 @@ in rec {
   systems.x86_64 = listsToSystemNames [archs.x86_64] platforms;
   systems.aarch64 = listsToSystemNames [archs.aarch64] platforms;
   systems.riscv64 = listsToSystemNames [archs.riscv64] platforms;
-
-  # === Internal Helper Functions ===
-  toSystemName = arch: platform: "${arch}-${platform}";
-  listsToSystemNames = archs: platforms:
-    lib.lists.crossLists (arch: platform: toSystemName arch platform)
-    (with lib.attrsets; [
-      (attrValues archs)
-      (attrValues platforms)
-    ]);
-
-  # === External Functions ===
-  # TODO
 }