From b4e47c34954b0a790b887433d7891b75be86a10d Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Fri, 12 May 2023 16:42:44 +0200
Subject: [PATCH] Use lib and modules from patched nixpkgs

---
 flake.nix | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/flake.nix b/flake.nix
index ea14a5bc..bdcabc3e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -107,7 +107,7 @@
         nur.overlay
         www-chvp-be.overlays.default
       ];
-      baseModules = [
+      commonModules = [
         accentor.nixosModules.default
         agenix.nixosModules.age
         home-manager.nixosModule
@@ -115,21 +115,24 @@
         nix-index-database.nixosModules.nix-index
         ./modules
       ];
-      nixosSystem = system: name: nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = baseModules ++ [
-          ({ config, ... }:
-            let nixpkgs = nixpkgsForSystem system; in
-            {
-              nixpkgs.pkgs = import nixpkgs { inherit overlays system; config = config.nixpkgs.config; };
-              networking.hostName = name;
-              nix = {
-                extraOptions = "extra-experimental-features = nix-command flakes";
-                registry = (builtins.mapAttrs (name: v: { flake = v; }) inputs) // { nixpkgs.flake = nixpkgs; };
-              };
-            })
-          ./machines/${name}
-        ];
+      nixosSystem = system: name: let nixpkgs = nixpkgsForSystem system; in
+        inputs.nixpkgs.lib.nixosSystem {
+          lib = (import nixpkgs { inherit overlays system; }).lib;
+          specialArgs = { modulesPath = toString (nixpkgs + "/nixos/modules"); };
+          system = "x86_64-linux";
+          baseModules = import (nixpkgs + "/nixos/modules/module-list.nix");
+          modules = commonModules ++ [
+            ({ config, ... }:
+              {
+                nixpkgs.pkgs = import nixpkgs { inherit overlays system; config = config.nixpkgs.config; };
+                networking.hostName = name;
+                nix = {
+                  extraOptions = "extra-experimental-features = nix-command flakes";
+                  registry = (builtins.mapAttrs (name: v: { flake = v; }) inputs) // { nixpkgs.flake = nixpkgs; };
+                };
+              })
+            ./machines/${name}
+          ];
       };
       nixosConfigurations = {
         kharbranth = nixosSystem "x86_64-linux" "kharbranth";