From 8d36bf6dec49b309b0362280313686c365555990 Mon Sep 17 00:00:00 2001
From: Bloxx12 <charlie@charlieroot.dev>
Date: Fri, 9 May 2025 11:56:26 +0200
Subject: [PATCH] flake: add rust-overlay for nightly rust

---
 flake.lock | 21 +++++++++++++++++++++
 flake.nix  | 30 ++++++++++++++++++------------
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 957dc1d..fe4ea03 100644
--- a/flake.lock
+++ b/flake.lock
@@ -19,9 +19,30 @@
     "root": {
       "inputs": {
         "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay",
         "systems": "systems"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1746758179,
+        "narHash": "sha256-JECUw1YBEsTsVauvupRzE5ykZaJoyhHCpoY87ZZJGas=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "4fd00513eac6b6140c5dced3e1b8133e2369a0f8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1689347949,
diff --git a/flake.nix b/flake.nix
index bf63f2e..a7f3f60 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,29 +3,35 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     systems.url = "github:nix-systems/default-linux";
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs: let
-    eachSystem = inputs.nixpkgs.lib.genAttrs (import inputs.systems);
-    pkgsFor = inputs.nixpkgs.legacyPackages;
+    inherit (inputs.nixpkgs) lib;
+    systems = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
+    eachSystem = lib.genAttrs systems;
+    pkgsFor = eachSystem (system:
+      import inputs.nixpkgs {
+        localSystem.system = system;
+        overlays = [(import inputs.rust-overlay)];
+      });
   in {
-    packages = eachSystem (system: {
-      default = inputs.self.packages.${system}.ralc;
-      ralc = pkgsFor.${system}.callPackage ./nix/package.nix {};
-    });
-
     devShells = eachSystem (system: {
       default = pkgsFor.${system}.mkShell {
         packages = builtins.attrValues {
           inherit
-            (pkgsFor.${system})
+            (pkgsFor.${system}.rust-bin.nightly.latest)
             cargo
             rustc
             rustfmt
-            bacon
-            ;
-          inherit
-            (pkgsFor.${system}.rustPackages)
             clippy
             ;
         };