diff --git a/flake.lock b/flake.lock
index 16a487ba13..53b6b67dac 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,30 +1,12 @@
 {
   "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1755186698,
-        "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
+        "lastModified": 1758690382,
+        "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
+        "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
         "type": "github"
       },
       "original": {
@@ -36,24 +18,8 @@
     },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
-    },
-    "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 588f608ffc..49bb95251a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,73 +1,80 @@
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
   };
-  outputs =
-    { nixpkgs, flake-utils, ... }:
-    flake-utils.lib.eachDefaultSystem (
-      system:
-      let
-        pkgs = nixpkgs.legacyPackages.${system};
+  outputs = {
+    nixpkgs,
+    self,
+    ...
+  } @ inputs: let
+    systems = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
+    forAllSystems = f:
+      nixpkgs.lib.genAttrs systems (
+        system: let
+          pkgs = import nixpkgs {inherit system;};
+        in
+          f {
+            inherit pkgs;
+            inherit (pkgs) lib;
+          }
+      );
+  in {
+    devShells = forAllSystems ({pkgs, ...}: {
+      default = with pkgs; let
+        # only bump toolchain versions here
+        go = go_1_25;
+        nodejs = nodejs_24;
+        python3 = python312;
+
+        # Platform-specific dependencies
+        linuxOnlyInputs = lib.optionals pkgs.stdenv.isLinux [
+          glibc.static
+        ];
+
+        linuxOnlyEnv = lib.optionalAttrs pkgs.stdenv.isLinux {
+          CFLAGS = "-I${glibc.static.dev}/include";
+          LDFLAGS = "-L ${glibc.static}/lib";
+        };
       in
-      {
-        devShells.default =
-          with pkgs;
-          let
-            # only bump toolchain versions here
-            go = go_1_25;
-            nodejs = nodejs_24;
-            python3 = python312;
-            pnpm = pnpm_10;
+        pkgs.mkShell {
+          buildInputs =
+            [
+              # generic
+              git
+              git-lfs
+              gnumake
+              gnused
+              gnutar
+              gzip
+              zip
 
-            # Platform-specific dependencies
-            linuxOnlyInputs = lib.optionals pkgs.stdenv.isLinux [
-              glibc.static
-            ];
+              # frontend
+              nodejs
 
-            linuxOnlyEnv = lib.optionalAttrs pkgs.stdenv.isLinux {
-              CFLAGS = "-I${glibc.static.dev}/include";
-              LDFLAGS = "-L ${glibc.static}/lib";
-            };
-          in
-          pkgs.mkShell (
-            {
-              buildInputs = [
-                # generic
-                git
-                git-lfs
-                gnumake
-                gnused
-                gnutar
-                gzip
-                zip
+              # linting
+              python3
+              poetry
 
-                # frontend
-                nodejs
-                pnpm
-                cairo
-                pixman
-                pkg-config
+              # backend
+              go
+              gofumpt
+              sqlite
+            ]
+            ++ linuxOnlyInputs;
 
-                # linting
-                python3
-                uv
+          GO = "${go}/bin/go";
+          GOROOT = "${go}/share/go";
 
-                # backend
-                go
-                gofumpt
-                sqlite
-              ]
-              ++ linuxOnlyInputs;
-
-              GO = "${go}/bin/go";
-              GOROOT = "${go}/share/go";
-
-              TAGS = "sqlite sqlite_unlock_notify";
-              STATIC = "true";
-            }
-            // linuxOnlyEnv
-          );
-      }
-    );
+          TAGS = "sqlite sqlite_unlock_notify";
+          STATIC = "true";
+        }
+        // linuxOnlyEnv;
+    });
+    });
+  };
 }