From 9fb310f51e2ef1fcb5d3cdfeb563bc62b407837e Mon Sep 17 00:00:00 2001
From: Jacob Birkett <jacob@birkett.dev>
Date: Thu, 1 Feb 2024 23:46:25 -0700
Subject: [PATCH] flake: move usages of with to smallest scopes

---
 flake.nix | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6bcb81a..2c6f2f7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,33 +20,33 @@
       in
         fn system pkgs);
   in {
-    packages = eachSystem (_: pkgs:
-      with pkgs; {
-        default = stdenv.mkDerivation {
-          name = "monolisa-nerdfont-patch";
-          src = ./.;
-          nativeBuildInputs = [makeWrapper];
-          buildInputs = [fontforge python3];
-          unpackPhase = ":";
-          buildPhase = ":";
-          installPhase = ''
-            mkdir -p $out/bin
-            install -m755 -D ${./patch-monolisa} $out/bin/monolisa-nerdfont-patch
-            install -m755 -D ${./font-patcher} $out/bin/font-patcher
-            cp -r ${./bin} $out/bin/bin
-            cp -r ${./src} $out/bin/src
-          '';
-          postFixup = ''
-            wrapProgram $out/bin/monolisa-nerdfont-patch \
-              --set PATH ${lib.makeBinPath [fontforge]}
-          '';
-        };
-      });
+    packages = eachSystem (_: pkgs: {
+      default = pkgs.stdenv.mkDerivation {
+        name = "monolisa-nerdfont-patch";
+        src = ./.;
+        nativeBuildInputs = with pkgs; [makeWrapper];
+        buildInputs = with pkgs; [fontforge python3];
+        unpackPhase = ":";
+        buildPhase = ":";
+        installPhase = ''
+          mkdir -p $out/bin
+          install -m755 -D ${./patch-monolisa} $out/bin/monolisa-nerdfont-patch
+          install -m755 -D ${./font-patcher} $out/bin/font-patcher
+          cp -r ${./bin} $out/bin/bin
+          cp -r ${./src} $out/bin/src
+        '';
+        postFixup = ''
+          wrapProgram $out/bin/monolisa-nerdfont-patch \
+            --set PATH ${lib.makeBinPath (with pkgs; [fontforge])}
+        '';
+      };
+    });
 
-    devShells = eachSystem (_: pkgs:
-      with pkgs; {
-        default = mkShell {buildInputs = [fontforge python3 pre-commit];};
-      });
+    devShells = eachSystem (_: pkgs: {
+      default = pkgs.mkShell {
+        buildInputs = with pkgs; [fontforge python3 pre-commit];
+      };
+    });
 
     formatter = eachSystem (system: _: alejandra.packages.${system}.default);
   };