diff --git a/flake.lock b/flake.lock
index c376fdb6..68c9f694 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "flake-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"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1722415718,
@@ -18,6 +36,7 @@
     },
     "root": {
       "inputs": {
+        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs",
         "rust-overlay": "rust-overlay"
       }
@@ -41,6 +60,21 @@
         "repo": "rust-overlay",
         "type": "github"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 84cfb830..c6a11b0a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,7 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -12,73 +13,52 @@
       self,
       nixpkgs,
       rust-overlay,
+      flake-utils,
       ...
     }:
-    let
-      systems = [
-        "aarch64-darwin"
-        "aarch64-linux"
-        "x86_64-darwin"
-        "x86_64-linux"
-      ];
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [
+            rust-overlay.overlays.default
+            (
+              final: prev:
+              let
+                toolchain = final.rust-bin.stable.latest.default;
+              in
+              {
+                rustPlatform = prev.makeRustPlatform {
+                  cargo = toolchain;
+                  rustc = toolchain;
+                };
+              }
+            )
+          ];
+        };
 
-      inherit (nixpkgs) lib;
-
-      forEachSystem =
-        f:
-        (lib.listToAttrs (
-          map (system: {
-            name = system;
-            value = f {
-              inherit system;
-              pkgs = import nixpkgs {
-                inherit system;
-                overlays = [
-                  rust-overlay.overlays.default
-
-                  (
-                    final: prev:
-                    let
-                      toolchain = final.rust-bin.stable.latest.default;
-                    in
-                    {
-                      rustPlatform = prev.makeRustPlatform {
-                        cargo = toolchain;
-                        rustc = toolchain;
-                      };
-                    }
-                  )
-                ];
-              };
-            };
-          }) systems
-        ));
-
-      rev = self.shortRev or self.dirtyShortRev or "dirty";
-      date = self.lastModifiedDate or self.lastModified or "19700101";
-      version =
-        (builtins.fromTOML (builtins.readFile ./yazi-fm/Cargo.toml)).package.version
-        + "pre${builtins.substring 0 8 date}_${rev}";
-    in
-    {
-      packages = forEachSystem (
-        { pkgs, system }:
-        {
+        rev = self.shortRev or self.dirtyShortRev or "dirty";
+        date = self.lastModifiedDate or self.lastModified or "19700101";
+        version =
+          (builtins.fromTOML (builtins.readFile ./yazi-fm/Cargo.toml)).package.version
+          + "pre${builtins.substring 0 8 date}_${rev}";
+      in
+      {
+        packages = {
           yazi-unwrapped = pkgs.callPackage ./nix/yazi-unwrapped.nix { inherit version rev date; };
           yazi = pkgs.callPackage ./nix/yazi.nix { inherit (self.packages.${system}) yazi-unwrapped; };
           default = self.packages.${system}.yazi;
-        }
-      );
+        };
 
-      devShells = forEachSystem (
-        { pkgs, ... }:
-        {
+        devShells = {
           default = pkgs.callPackage ./nix/shell.nix { };
-        }
-      );
-
-      formatter = forEachSystem ({ pkgs, ... }: pkgs.nixfmt-rfc-style);
+        };
 
+        formatter = pkgs.nixfmt-rfc-style;
+      }
+    )
+    // {
       overlays = {
         default = self.overlays.yazi;
         yazi = _: prev: { inherit (self.packages.${prev.stdenv.system}) yazi yazi-unwrapped; };