From 5e8ac5e4b622644e3eb9ce748d8325db8a939dd5 Mon Sep 17 00:00:00 2001
From: Evan Reichard <evan@reichard.io>
Date: Sat, 17 Jan 2026 13:53:11 -0500
Subject: [PATCH] fix: multi arch flake

---
 .envrc     |  1 +
 flake.lock | 34 +++++++++++++++++++++++++++++
 flake.nix  | 64 ++++++++++++++++++++++++++++++++----------------------
 3 files changed, 73 insertions(+), 26 deletions(-)
 create mode 100644 .envrc

diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..3550a30
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/flake.lock b/flake.lock
index fe22ed6..a0727f6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,23 @@
 {
   "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": 1767047869,
@@ -18,8 +36,24 @@
     },
     "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 10e22a3..5950761 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,37 +1,49 @@
 {
-  description = "ARM cross-compilation environment";
+  description = "Development Environment";
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+    flake-utils.url = "github:numtide/flake-utils";
   };
 
   outputs =
-    { self, nixpkgs }:
-    let
-      system = "x86_64-linux";
-      pkgs = nixpkgs.legacyPackages.${system};
+    { self
+    , nixpkgs
+    , flake-utils
+    ,
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = (
+          import nixpkgs {
+            system = system;
+            config.allowUnfree = true;
+          }
+        );
 
-      oc = pkgs.writeShellScriptBin "oc" ''
-        PRJ_ROOT=$(git rev-parse --show-toplevel 2>/dev/null || pwd)
-        cd "$PRJ_ROOT" && OPENCODE_EXPERIMENTAL_LSP_TOOL=true opencode
-      '';
-    in
-    {
-      devShells.${system}.default = pkgs.mkShell {
-        buildInputs = with pkgs; [
-          # Backend
-          go
-          gopls
-          golangci-lint
+        oc = pkgs.writeShellScriptBin "oc" ''
+          PRJ_ROOT=$(git rev-parse --show-toplevel 2>/dev/null || pwd)
+          cd "$PRJ_ROOT" && OPENCODE_EXPERIMENTAL_LSP_TOOL=true opencode
+        '';
+      in
+      {
+        devShells.default = pkgs.mkShell {
+          packages = with pkgs; [
+            # Backend
+            go
+            gopls
+            golangci-lint
 
-          # Frontend
-          bun
-          watchman
-          tailwindcss_4
+            # Frontend
+            bun
+            watchman
+            tailwindcss_4
 
-          # Custom Commands
-          oc
-        ];
-      };
-    };
+            # Custom Commands
+            oc
+          ];
+        };
+      }
+    );
 }