From 18418415d1321b60adb39cfad331890d36575180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Mon, 8 Dec 2025 20:17:38 +0800
Subject: [PATCH] tree-wide: set nixpkgs in NIX_PATH without flake

This prevents double fetch
---
 nix/configurations/hetzner_benchmark.nix | 7 +++----
 nix/configurations/hydrogen.nix          | 7 +++----
 nix/configurations/vanadium.nix          | 7 +++----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/nix/configurations/hetzner_benchmark.nix b/nix/configurations/hetzner_benchmark.nix
index 2fddb026..6201e6f1 100644
--- a/nix/configurations/hetzner_benchmark.nix
+++ b/nix/configurations/hetzner_benchmark.nix
@@ -31,6 +31,9 @@ in
     # nixpkgs
     #
     {
+      # don't use `nixpkgs.flake.source`, it uses flake so it double fetches
+      nix.nixPath = [ "nixpkgs=${sources.nixpkgs}" ];
+
       nixpkgs = {
         overlays = map import [
           ../packages/overlay.nix
@@ -39,10 +42,6 @@ in
           ../overlays/lix.nix
           ../overlays/nix-monitored.nix
         ];
-
-        # Set NIX_PATH and flake registry at the same time
-        # https://github.com/NixOS/nixpkgs/pull/254405
-        flake.source = sources.nixpkgs;
       };
 
       nix.package = pkgs.nix-monitored;
diff --git a/nix/configurations/hydrogen.nix b/nix/configurations/hydrogen.nix
index c751ef0a..5a303423 100644
--- a/nix/configurations/hydrogen.nix
+++ b/nix/configurations/hydrogen.nix
@@ -34,6 +34,9 @@ in
     # nixpkgs
     #
     {
+      # don't use `nixpkgs.flake.source`, it uses flake so it double fetches
+      nix.nixPath = [ "nixpkgs=${sources.nixpkgs}" ];
+
       nixpkgs = {
         overlays = map import [
           ../overlays/agenix.nix
@@ -45,10 +48,6 @@ in
           ../overlays/lix.nix
           ../overlays/nix-monitored.nix
         ];
-
-        # Set NIX_PATH and flake registry at the same time
-        # https://github.com/NixOS/nixpkgs/pull/254405
-        flake.source = sources.nixpkgs;
       };
 
       nix.package = pkgs.nix-monitored;
diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix
index 2fba0b2a..f881d389 100644
--- a/nix/configurations/vanadium.nix
+++ b/nix/configurations/vanadium.nix
@@ -35,6 +35,9 @@ in
       nix = {
         distributedBuilds = true;
         settings.builders-use-substitutes = true;
+
+        # don't use `nixpkgs.flake.source`, it uses flake so it double fetches
+        nixPath = [ "nixpkgs=${sources.nixpkgs}" ];
       };
 
       nixpkgs = {
@@ -70,10 +73,6 @@ in
           ../overlays/lix.nix
           ../overlays/nix-monitored.nix
         ];
-
-        # Set NIX_PATH and flake registry at the same time
-        # https://github.com/NixOS/nixpkgs/pull/254405
-        flake.source = sources.nixpkgs;
       };
 
       nix.package = pkgs.nix-monitored;