From 6efd55712d73e65c0fb4304cfd1649723bb757ef Mon Sep 17 00:00:00 2001
From: Danilo Reyes <danilo.reyes.251@proton.me>
Date: Mon, 10 Nov 2025 12:28:47 -0600
Subject: [PATCH] Refactor Nix package definitions in flake.nix and run.nix to
 improve dependency handling and formatting. Changes include renaming
 variables for clarity, adding the download package to run.nix, and enhancing
 the structure of package overrides.

---
 flake.nix    | 16 +++++++++++-----
 pkgs/run.nix |  3 ++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index 44cbc5c..2a79302 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,21 +31,27 @@
     {
       overlays.default = _final: prev: {
         python3Packages = prev.python3Packages.override {
-          overrides = pyself: pysuper: {
+          overrides = _pyself: _pysuper: {
             webcomix = prev.python3Packages.callPackage ./pkgs_pr/webcomix.nix { };
+            download = prev.python3Packages.callPackage ./pkgs/download.nix {
+              webcomix = _pyself.webcomix;
+            };
           };
         };
+        download = _final.python3Packages.download;
       };
       packages.x86_64-linux =
         let
           scriptBin = path: name: pkgs.writeScriptBin name (builtins.readFile path);
-          pkgsBin = path: _name: 
+          pkgsBin =
+            path: _name:
             let
               content = builtins.readFile path;
             in
-            if builtins.match ".*(buildPythonPackage|buildPythonApplication).*" content != null
-            then pkgs.python3Packages.callPackage path { }
-            else pkgs.callPackage path { };
+            if builtins.match ".*(buildPythonPackage|buildPythonApplication).*" content != null then
+              pkgs.python3Packages.callPackage path { }
+            else
+              pkgs.callPackage path { };
         in
         {
           citra = pkgs.callPackage ./pkgs/citra/default.nix { branch = "nightly"; };
diff --git a/pkgs/run.nix b/pkgs/run.nix
index 6c33625..e2cfcd5 100644
--- a/pkgs/run.nix
+++ b/pkgs/run.nix
@@ -7,7 +7,7 @@
   xclip,
   ghostty,
   rmlint,
-  callPackage,
+  download,
   ...
 }:
 writeShellApplication {
@@ -21,6 +21,7 @@ writeShellApplication {
     xclip
     ghostty
     rmlint
+    download
   ];
 
   text = builtins.readFile ../src/packaged_scripts/run.sh;