From 4faf1d79555496b3e5848cc8bd0792f99724ebf2 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Wed, 28 Feb 2024 09:51:02 +0100
Subject: [PATCH] flake: Better fix for registry changes

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

diff --git a/flake.nix b/flake.nix
index 91c99930..5aa87c15 100644
--- a/flake.nix
+++ b/flake.nix
@@ -141,14 +141,17 @@
           modules = commonModules ++ [
             ({ config, ... }:
               {
-                nixpkgs.pkgs = import nixpkgs {
-                  inherit overlays system;
-                  config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.chvp.base.nix.unfreePackages;
+                nixpkgs = {
+                  pkgs = import nixpkgs {
+                    inherit overlays system;
+                    config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) config.chvp.base.nix.unfreePackages;
+                  };
+                  flake.source = lib.mkForce "${nixpkgs}";
                 };
                 networking.hostName = name;
                 nix = {
                   extraOptions = "extra-experimental-features = nix-command flakes";
-                  registry = (builtins.mapAttrs (name: v: { flake = v; }) inputs) // { nixpkgs = { flake = nixpkgs; to.path = lib.mkForce "${nixpkgs}"; }; };
+                  registry = (builtins.mapAttrs (name: v: { flake = v; }) inputs) // { nixpkgs = { flake = nixpkgs; }; };
                 };
               })
             ./machines/${name}