From 57aa1103476fa98b45e43ae8ce43a756ee6ccd94 Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Wed, 26 Mar 2025 11:51:51 -0400
Subject: [PATCH] don't overlay pixelflasher and don't patch attic num_prefetch

---
 flake.lock                            | 17 -----------------
 flake.nix                             |  1 -
 overlay/attic/prefetch-8-chunks.patch |  9 ---------
 overlay/default.nix                   |  1 -
 4 files changed, 28 deletions(-)

diff --git a/flake.lock b/flake.lock
index ddda4b4..a6ee1bb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -945,22 +945,6 @@
         "type": "github"
       }
     },
-    "pixelflasher": {
-      "locked": {
-        "lastModified": 1741302870,
-        "narHash": "sha256-7AywZ1b3PaqolAZ0vQmddD6Br4o0a7ucdtE0/W3rnaM=",
-        "owner": "cything",
-        "repo": "nixpkgs",
-        "rev": "5ef8b274bb7f939104295a22cec3382268ed73cc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cything",
-        "ref": "pixelflasher",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks-nix": {
       "inputs": {
         "flake-compat": [
@@ -1024,7 +1008,6 @@
         "nixpkgs-stable": "nixpkgs-stable_2",
         "nixvim": "nixvim",
         "nvim-github-theme": "nvim-github-theme",
-        "pixelflasher": "pixelflasher",
         "rust-overlay": "rust-overlay",
         "sops-nix": "sops-nix",
         "treefmt": "treefmt",
diff --git a/flake.nix b/flake.nix
index 1c5adea..b5fccc8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,7 +71,6 @@
       url = "github:nix-community/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    pixelflasher.url = "github:cything/nixpkgs/pixelflasher";
     attic = {
       url = "github:zhaofengli/attic";
       inputs = {
diff --git a/overlay/attic/prefetch-8-chunks.patch b/overlay/attic/prefetch-8-chunks.patch
index eafc514..3d6134f 100644
--- a/overlay/attic/prefetch-8-chunks.patch
+++ b/overlay/attic/prefetch-8-chunks.patch
@@ -11,13 +11,4 @@ index 02e4857..b522154 100644
              Download::Url(url) => Ok(Redirect::temporary(&url).into_response()),
              Download::AsyncRead(stream) => {
                  let stream = ReaderStream::new(stream).map_err(|e| {
-@@ -262,7 +262,7 @@ async fn get_nar(
- 
-         // TODO: Make num_prefetch configurable
-         // The ideal size depends on the average chunk size
--        let merged = merge_chunks(chunks, streamer, storage, 2).map_err(|e| {
-+        let merged = merge_chunks(chunks, streamer, storage, 8).map_err(|e| {
-             tracing::error!(%e, "Stream error");
-             e
-         });
 
diff --git a/overlay/default.nix b/overlay/default.nix
index d8780e2..71bee1e 100644
--- a/overlay/default.nix
+++ b/overlay/default.nix
@@ -16,7 +16,6 @@ in
     in
     {
       conduwuit = pkgFrom inputs.conduwuit "default";
-      pixelflasher = nixpkgsFrom inputs.pixelflasher "pixelflasher";
       attic-server = pkgFrom inputs.attic "attic-server";
       attic = pkgFrom inputs.attic "attic";
       garage = (