From 17116786bcf1d91a322a476b9c12a64b3cf96ed7 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Mon, 11 Nov 2024 20:03:38 -0500
Subject: [PATCH] global/nix: move NIX_PATH to nix.conf

---
 modules/global/nix.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/global/nix.nix b/modules/global/nix.nix
index c846217..5a01709 100644
--- a/modules/global/nix.nix
+++ b/modules/global/nix.nix
@@ -32,8 +32,10 @@ in
 
       min-free = 536870912; # 0.5 gibi bytes
 
-      # Workaround for https://github.com/NixOS/nix/issues/9574
-      nix-path = config.nix.nixPath;
+      nix-path = [
+        "nixpkgs=${inputs.nixpkgs}"
+        "devshell=${inputs.devshell}"
+      ];
     };
 
     gc = {
@@ -59,11 +61,6 @@ in
         };
       };
 
-    nixPath = [
-      "nixpkgs=${inputs.nixpkgs}"
-      "devshell=${inputs.devshell}"
-    ];
-
     distributedBuilds = mkDefault true;
     extraOptions = ''
       builders-use-substitutes = true