From 7a136f4eb7a1c2df0f38045d928bbde7d4a7ab7c Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Sat, 15 Jun 2024 17:17:23 +0200
Subject: [PATCH] fixup! nix: Update global nixpkgs definition

---
 modules/nix.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/nix.nix b/modules/nix.nix
index fb1fa4a..d615aaf 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -31,11 +31,6 @@ in
       nixpkgs-unstable.flake = nixpkgs-unstable;
     };
 
-    nixPath = [
-      "nixpkgs-overlays=${overlaysCompat}"
-      "nixpkgs-unstable=flake:nixpkgs-unstable"
-    ];
-
     settings = {
       # Make sudoers trusted nix users
       trusted-users = [ "@wheel" ];
@@ -44,6 +39,13 @@ in
       auto-optimise-store = true;
 
       experimental-features = "nix-command flakes";
+
+      # nix.nixPath does not work when nix.channel.enable == false (for some reason)
+      nix-path = [
+        "nixpkgs-overlays=${overlaysCompat}"
+        "nixpkgs=flake:nixpkgs"
+        "nixpkgs-unstable=flake:nixpkgs-unstable"
+      ];
     } // (lib.optionalAttrs config.sbruder.full {
       # Keep output of derivations with gc root
       keep-outputs = true;