From 265129d4190e3040012e01cd639805b1f8c0d830 Mon Sep 17 00:00:00 2001
From: Carlos de Paula <me@carlosedp.com>
Date: Mon, 20 Oct 2025 17:46:56 -0300
Subject: [PATCH] Make the nix flake and shell use rust nightly toolkit since
 it's used in the code

---
 flake.nix     | 50 ++++++++++++++++++--------------------------------
 nix/shell.nix | 21 +++++----------------
 2 files changed, 23 insertions(+), 48 deletions(-)

diff --git a/flake.nix b/flake.nix
index 88b7ac49..900af908 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,22 +8,14 @@
     };
   };
 
-  outputs =
-    {
-      self,
-      nixpkgs,
-      rust-overlay,
-      flake-utils,
-      ...
-    }:
-    flake-utils.lib.eachDefaultSystem (
-      system:
+  outputs = { self, nixpkgs, rust-overlay, flake-utils, ... }:
+    flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs {
           inherit system;
           overlays = [ rust-overlay.overlays.default ];
         };
-        toolchain = pkgs.rust-bin.stable.latest.default;
+        toolchain = pkgs.rust-bin.nightly.latest.default;
         rustPlatform = pkgs.makeRustPlatform {
           cargo = toolchain;
           rustc = toolchain;
@@ -31,35 +23,29 @@
 
         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
+        version = (builtins.fromTOML
+          (builtins.readFile ./yazi-fm/Cargo.toml)).package.version
           + "pre${builtins.substring 0 8 date}_${rev}";
-      in
-      {
+      in {
         packages = {
           yazi-unwrapped = pkgs.callPackage ./nix/yazi-unwrapped.nix {
-            inherit
-              version
-              rev
-              date
-              rustPlatform
-              ;
+            inherit version rev date rustPlatform;
+          };
+          yazi = pkgs.callPackage ./nix/yazi.nix {
+            inherit (self.packages.${system}) yazi-unwrapped;
           };
-          yazi = pkgs.callPackage ./nix/yazi.nix { inherit (self.packages.${system}) yazi-unwrapped; };
           default = self.packages.${system}.yazi;
         };
 
-        devShells = {
-          default = pkgs.callPackage ./nix/shell.nix { };
-        };
+        devShells = { default = pkgs.callPackage ./nix/shell.nix { }; };
 
         formatter = pkgs.nixfmt-rfc-style;
-      }
-    )
-    // {
-      overlays = {
-        default = self.overlays.yazi;
-        yazi = _: prev: { inherit (self.packages.${prev.stdenv.system}) yazi yazi-unwrapped; };
+      }) // {
+        overlays = {
+          default = self.overlays.yazi;
+          yazi = _: prev: {
+            inherit (self.packages.${prev.stdenv.system}) yazi yazi-unwrapped;
+          };
+        };
       };
-    };
 }
diff --git a/nix/shell.nix b/nix/shell.nix
index a6750e43..6390a45c 100644
--- a/nix/shell.nix
+++ b/nix/shell.nix
@@ -1,20 +1,9 @@
-{
-  callPackage,
-  rust-bin,
-  nodePackages,
-}:
-let
-  mainPkg = callPackage ./yazi.nix { };
-in
-mainPkg.overrideAttrs (oa: {
+{ callPackage, rust-bin, nodePackages, }:
+let mainPkg = callPackage ./yazi.nix { };
+in mainPkg.overrideAttrs (oa: {
   nativeBuildInputs = [
-    (rust-bin.stable.latest.default.override {
-      extensions = [
-        "rust-src"
-        "rustfmt"
-        "rust-analyzer"
-        "clippy"
-      ];
+    (rust-bin.nightly.latest.default.override {
+      extensions = [ "rust-src" "rustfmt" "rust-analyzer" "clippy" ];
     })
 
     nodePackages.cspell