refactor(nix): cleanup and switch to nixfmt-rfc-style (#1376)

Co-authored-by: Isabel <isabel@isabelroses.com>

flake.nix

@@ -11,26 +11,31 @@
     };
   };
 
-  outputs = { self, nixpkgs, flake-utils, rust-overlay, ... }@inputs:
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+      rust-overlay,
+      ...
+    }@inputs:
     let
       # Nixpkgs overlays
       overlays = [
         rust-overlay.overlays.default
-        (final: prev: {
+        (final: _: {
-          rustToolchain = final.rust-bin.stable.latest.default.override {
+          rustToolchain = final.rust-bin.stable.latest.default.override { extensions = [ "rust-src" ]; };
-            extensions = [ "rust-src" ];
-          };
         })
       ];
     in
-    flake-utils.lib.eachDefaultSystem
+    flake-utils.lib.eachDefaultSystem (
-      (system:
+      system:
       let
         pkgs = import nixpkgs { inherit system overlays; };
         rev = self.shortRev or "dirty";
-          date = (self.lastModifiedDate or self.lastModified or "19700101");
+        date = self.lastModifiedDate or self.lastModified or "19700101";
-          version = (builtins.fromTOML
+        version =
-            (builtins.readFile ./yazi-fm/Cargo.toml)).package.version
+          (builtins.fromTOML (builtins.readFile ./yazi-fm/Cargo.toml)).package.version
           + "pre${builtins.substring 0 8 date}_${rev}";
 
         yazi-unwrapped = pkgs.callPackage ./nix/yazi-unwrapped.nix { inherit version rev date; };
@@ -42,17 +47,15 @@
           default = yazi;
         };
 
-          formatter = pkgs.nixpkgs-fmt;
+        formatter = pkgs.nixfmt-rfc-style;
 
         devShells.default = import ./nix/shell.nix { inherit pkgs inputs; };
-        })
+      }
+    )
     // {
       overlays = rec {
         default = yazi;
-        yazi = final: prev: {
+        yazi = final: _: { inherit (self.packages."${final.system}") yazi yazi-unwrapped; };
-          yazi-unwrapped = self.packages."${final.system}".yazi-unwrapped;
-          yazi = self.packages."${final.system}".yazi;
-        };
       };
     };
 }

nix/shell.nix

@@ -18,9 +18,11 @@ pkgs.mkShell {
     zoxide
   ];
 
-  buildInputs = with pkgs;
+  buildInputs =
-    lib.optionals stdenv.isDarwin
+    with pkgs;
-      (with darwin.apple_sdk.frameworks; [ Foundation ]);
+    lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Foundation ]);
 
-  env = { RUST_BACKTRACE = "1"; };
+  env = {
+    RUST_BACKTRACE = "1";
+  };
 }

nix/yazi-unwrapped.nix

@@ -1,20 +1,25 @@
-{ makeRustPlatform
+{
-, rustToolchain
+  makeRustPlatform,
-, version ? "git"
+  rustToolchain,
-, rev
+  version ? "git",
-, date
+  rev,
-, lib
+  date,
+  lib,
 
-, installShellFiles
+  installShellFiles,
-, stdenv
+  stdenv,
-, darwin
+  darwin,
 
-, imagemagick
+  imagemagick,
 }:
 
-(makeRustPlatform { cargo = rustToolchain; rustc = rustToolchain; }).buildRustPackage rec {
+(makeRustPlatform {
+  cargo = rustToolchain;
+  rustc = rustToolchain;
+}).buildRustPackage
+  {
     pname = "yazi";
-  inherit version rev;
+    inherit version;
 
     src = ../.;
 
@@ -25,14 +30,17 @@
       };
     };
 
-  env.YAZI_GEN_COMPLETIONS = true;
+    env = {
-  env.VERGEN_GIT_SHA = rev;
+      YAZI_GEN_COMPLETIONS = true;
-  env.VERGEN_BUILD_DATE = builtins.concatStringsSep "-" (builtins.match "(.{4})(.{2})(.{2}).*" date);
+      VERGEN_GIT_SHA = rev;
+      VERGEN_BUILD_DATE = builtins.concatStringsSep "-" (builtins.match "(.{4})(.{2})(.{2}).*" date);
+    };
 
-  nativeBuildInputs = [ installShellFiles imagemagick ];
+    nativeBuildInputs = [
-  buildInputs = lib.optionals stdenv.isDarwin (
+      installShellFiles
-    with darwin.apple_sdk.frameworks; [ Foundation ]
+      imagemagick
-  );
+    ];
+    buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Foundation ]);
 
     postInstall = ''
       installShellCompletion --cmd yazi \
@@ -50,10 +58,10 @@
       install -m644 assets/yazi.desktop $out/share/applications/
     '';
 
-  meta = with lib; {
+    meta = {
       description = "Blazing fast terminal file manager written in Rust, based on async I/O";
       homepage = "https://github.com/sxyazi/yazi";
-    license = licenses.mit;
+      license = lib.licenses.mit;
       mainProgram = "yazi";
     };
   }

nix/yazi.nix

@@ -1,31 +1,33 @@
-{ lib
+{
-, runCommand
+  lib,
-, makeWrapper
+  runCommand,
-, yazi-unwrapped
+  makeWrapper,
+  yazi-unwrapped,
 
-, withFile ? true
+  withFile ? true,
-, file
+  file,
-, withJq ? true
+  withJq ? true,
-, jq
+  jq,
-, withPoppler ? true
+  withPoppler ? true,
-, poppler_utils
+  poppler_utils,
-, withUnar ? true
+  withUnar ? true,
-, unar
+  unar,
-, withFfmpegthumbnailer ? true
+  withFfmpegthumbnailer ? true,
-, ffmpegthumbnailer
+  ffmpegthumbnailer,
-, withFd ? true
+  withFd ? true,
-, fd
+  fd,
-, withRipgrep ? true
+  withRipgrep ? true,
-, ripgrep
+  ripgrep,
-, withFzf ? true
+  withFzf ? true,
-, fzf
+  fzf,
-, withZoxide ? true
+  withZoxide ? true,
-, zoxide
+  zoxide,
 }:
 
 let
-  runtimePaths = with lib; [ ]
+  inherit (lib) optional makeBinPath;
-    ++ optional withFile file
+  runtimePaths =
+    optional withFile file
     ++ optional withJq jq
     ++ optional withPoppler poppler_utils
     ++ optional withUnar unar
@@ -40,10 +42,11 @@ runCommand yazi-unwrapped.name
     inherit (yazi-unwrapped) pname version meta;
 
     nativeBuildInputs = [ makeWrapper ];
-} ''
+  }
+  ''
     mkdir -p $out/bin
     ln -s ${yazi-unwrapped}/share $out/share
     ln -s ${yazi-unwrapped}/bin/ya $out/bin/ya
     makeWrapper ${yazi-unwrapped}/bin/yazi $out/bin/yazi \
-    --prefix PATH : "${lib.makeBinPath runtimePaths}"
+      --prefix PATH : "${makeBinPath runtimePaths}"
   ''