From e93b181c1e10aedb1ffd5713c73867619d19a590 Mon Sep 17 00:00:00 2001
From: Avery Winters <git@averywinters.org>
Date: Thu, 24 Oct 2024 13:03:22 -0500
Subject: [PATCH] Update flake

---
 flake.lock | 45 ++++++++++++++++++++++++++++++++++++++++++---
 flake.nix  | 21 +++++++++++++++------
 2 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index a89fd70..5ae8551 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,6 +20,27 @@
         "type": "github"
       }
     },
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1729751566,
+        "narHash": "sha256-99u/hrgBdi8bxSXZc9ZbNkR5EL1htrkbd3lsbKzS60g=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "f32a2d484091a6dc98220b1f4a2c2d60b7c97c64",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -40,11 +61,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1729658218,
-        "narHash": "sha256-9Rg+AqLqvqqJniP/OQB3GtgXoAd8IlazsHp97va042Y=",
+        "lastModified": 1729722069,
+        "narHash": "sha256-gY9Wc8ZhBsPdQqWnTV+XuNaj2dbQW0uslAaJHamczSE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dfffb2e7a52d29a0ef8e21ec8a0f30487b227f1a",
+        "rev": "6301495959cf1737c6ebcd153833e4c4596f56e2",
         "type": "github"
       },
       "original": {
@@ -57,10 +78,28 @@
     "root": {
       "inputs": {
         "devshell": "devshell",
+        "fenix": "fenix",
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
     },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1729715509,
+        "narHash": "sha256-jUDN4e1kObbksb4sc+57NEeujBEDRdLCOu9wiE3RZdM=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "40492e15d49b89cf409e2c5536444131fac49429",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
diff --git a/flake.nix b/flake.nix
index 85ffee2..0dbf073 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,30 +8,39 @@
       url = "github:numtide/devshell";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    fenix = {
+      url = "github:nix-community/fenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     flake-utils.url = "github:numtide/flake-utils";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
   };
   outputs = {
     devshell,
+    fenix,
     flake-utils,
     nixpkgs,
     ...
   }: (flake-utils.lib.eachDefaultSystem (system: let
     pkgs = import nixpkgs {
       inherit system;
-      overlays = [devshell.overlays.default];
+      overlays = [
+        devshell.overlays.default
+        fenix.overlays.default
+      ];
     };
   in {
     formatter = pkgs.alejandra;
     devShells.default = pkgs.devshell.mkShell {
       commands = [
-        {package = pkgs.clang;}
-        {package = pkgs.cargo;}
+        {package = pkgs.clangStdenv;}
+        {package = pkgs.fenix.default.toolchain; }
+        {package = pkgs.cargo-flamegraph;}
+        {package = pkgs.samply;}
+        {package = pkgs.hyperfine;}
         {package = pkgs.exercism;}
         {package = pkgs.nil;}
-        {package = pkgs.rustc;}
-        {package = pkgs.rustfmt;}
-        {package = pkgs.rust-analyzer;}
+        {package = pkgs.rust-analyzer-nightly;}
       ];
     };
   }));