feat(flake): use nix-systems and make sure all inputs use the same one

inputs.nix

@@ -1,30 +1,36 @@
 let
-  inherit (builtins) listToAttrs map removeAttrs;
+  lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+  lib = import "${builtins.fetchTarball {
+    url = "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.nixpkgs.locked.rev}.tar.gz";
+    sha256 = lock.nodes.nixpkgs.locked.narHash;
+  }}/lib";
+
+  inherit (lib) attrValues findFirst foldl' hasAttr listToAttrs matchAttrs map optionalAttrs recursiveUpdate removeAttrs;
+
+  recursiveUpdateList = list: foldl' recursiveUpdate {} list;
 
   # Misc functions
-  mkInput = {type ? "github", ...} @ info: info // {inherit type;};
+  mkInput = {type ? "github", ...} @ info: let
-  mkDep = info:
+    input =
-    mkInput (info
+      findFirst
-      // {
+      (x: matchAttrs (removeAttrs info ["inputs"]) (x.original or {})) {}
-        inputs =
+      (attrValues lock.nodes);
-          {nixpkgs.follows = "nixpkgs";}
+
-          // (
+    mkOverride = i:
-            if builtins.hasAttr "inputs" info
+      optionalAttrs
-            then info.inputs
+      (hasAttr i (input.inputs or {}))
-            else {}
+      {inputs.${i}.follows = i;};
-          );
+  in
-      });
+    recursiveUpdateList [
-  mkHyprDep = info:
+      info
-    mkInput (info
+      {inherit type;}
-      // {
+      (mkOverride "systems")
-        inputs =
+      (mkOverride "flake-utils")
-          {hyprland.follows = "hyprland";}
+      (mkOverride "lib-aggregate")
-          // (
+    ];
-            if builtins.hasAttr "inputs" info
+
-            then info.inputs
+  mkDep = info: mkInput (recursiveUpdate info {inputs.nixpkgs.follows = "nixpkgs";});
-            else {}
+  mkHyprDep = info: mkInput (recursiveUpdate info {inputs.hyprland.follows = "hyprland";});
-          );
-      });
   mkSrc = info: mkInput (info // {flake = false;});
 
   # Inputs
@@ -54,10 +60,14 @@ let
       repo = "nix-melt";
     };
 
-    mozilla-addons-to-nix = mkDep {
+    # These are here to make sure all 'systems' are the same
-      type = "sourcehut";
+    flake-utils = mkInput {
-      owner = "~rycee";
+      owner = "numtide";
-      repo = "mozilla-addons-to-nix";
+      repo = "flake-utils";
+    };
+    lib-aggregate = mkInput {
+      owner = "nix-community";
+      repo = "lib-aggregate";
     };
   };
 
@@ -151,11 +161,6 @@ let
         # path = "/home/matt/git/hyprland-plugins";
       };
 
-      Hyprspace = mkHyprDep {
-        owner = "KZDKM";
-        repo = "Hyprspace";
-      };
-
       hyprgrass = mkHyprDep {
         owner = "horriblename";
         repo = "hyprgrass";
@@ -304,7 +309,13 @@ in {
   inherit mkDep mkInput mkSrc;
 
   otherInputs =
-    nixTools
+    {
+      flakegen = {
+        url = "github:jorsn/flakegen";
+        inputs.systems.follows = "systems";
+      };
+    }
+    // nixTools
     // overlays
     // nvimInputs
     // clusterInputs

outputs.nix

@@ -3,6 +3,11 @@
     inherit (import ./inputs.nix) mkDep mkInput otherInputs;
 
     mainInputs = {
+      systems = mkInput {
+        owner = "nix-systems";
+        repo = "default-linux";
+      };
+
       nixpkgs = mkInput {
         owner = "NixOS";
         repo = "nixpkgs";
@@ -45,14 +50,13 @@
     nixpkgs,
     secrets,
     self,
+    systems,
     ...
   }: let
     inherit (import "${self}/lib.nix" inputs) mkVersion mkNixOS mkNixOnDroid mkPkgs;
 
-    supportedSystems = ["x86_64-linux" "aarch64-linux"];
-
     perSystem = attrs:
-      nixpkgs.lib.genAttrs supportedSystems (system:
+      nixpkgs.lib.genAttrs (import systems) (system:
         attrs (mkPkgs system nixpkgs));
   in {
     nixosModules = import ./nixosModules self;