remove flake-utils, clean up

flake.lock

@@ -18,41 +18,7 @@
     },
     "root": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs"
-        "utils": "utils"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
       }
     }
   },

flake.nix

@@ -3,56 +3,62 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    utils.url = "github:numtide/flake-utils";
   };
 
   outputs =
-    {
+    { self, nixpkgs }:
-      self,
+    let
-      nixpkgs,
+      inherit (nixpkgs) lib;
-      utils,
+      makePkgs =
-    }:
+        system:
-    utils.lib.eachDefaultSystem (
+        import nixpkgs {
-      system:
-      let
-        pkgs = import nixpkgs {
           inherit system;
           overlays = [ self.overlays.default ];
         };
-        inherit (pkgs) lib;
+      forAllSystems =
-        names = builtins.attrNames (self.overlays.default pkgs pkgs);
+        f:
-      in
+        lib.listToAttrs (
-      {
+          map (system: {
-        devShells = {
+            name = system;
-          plotter = pkgs.callPackage ./shells/plotter { };
+            value = f (makePkgs system);
-          ryujinx = pkgs.callPackage ./shells/ryujinx { };
+          }) lib.systems.flakeExposed
-          zephyr = pkgs.callPackage ./shells/zephyr { };
+        );
-        };
+      makeDummy =
+        pkg:
+        if lib.isDerivation pkg then
+          pkg
+        else
+          pkg
+          // {
+            type = "derivation";
+            name = "dummy-attrset";
+          };
+    in
+    {
+      formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);
 
-        formatter = pkgs.nixfmt-rfc-style;
+      devShells = forAllSystems (pkgs: {
-        packages = builtins.listToAttrs (
+        plotter = pkgs.callPackage ./shells/plotter { };
+        ryujinx = pkgs.callPackage ./shells/ryujinx { };
+        zephyr = pkgs.callPackage ./shells/zephyr { };
+      });
+
+      packages = forAllSystems (
+        pkgs:
+        builtins.listToAttrs (
+          let
+            names = builtins.attrNames (self.overlays.default pkgs pkgs);
+          in
           lib.concatMap (
             name:
-            let
+            lib.optional (builtins.typeOf pkgs.${name} == "set") {
-              pkg = pkgs.${name};
-            in
-            lib.optional (builtins.typeOf pkg == "set") {
               inherit name;
-              value =
+              value = makeDummy pkgs.${name};
-                if lib.isDerivation pkg then
-                  pkg
-                else
-                  pkg
-                  // {
-                    type = "derivation";
-                    name = "dummy-attrset";
-                  };
             }
           ) names
-        );
+        )
-      }
+      );
-    )
+
-    // {
       overlays.default = final: prev: {
         apotris = final.callPackage ./packages/apotris { };
         attic = final.callPackage ./packages/attic { };