From eaa203fa9af14e6ce7c9139c928be7a099a0ef4b Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Sun, 24 Aug 2025 20:27:54 +0200
Subject: [PATCH] factor out to nixos.nix

---
 deployment/check/data-model/nixosTest.nix | 17 +----------------
 deployment/nixos.nix                      | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/deployment/check/data-model/nixosTest.nix b/deployment/check/data-model/nixosTest.nix
index 238a8b1e..52d6f70e 100644
--- a/deployment/check/data-model/nixosTest.nix
+++ b/deployment/check/data-model/nixosTest.nix
@@ -90,23 +90,8 @@ in
                     autoconf
                   ];
                 };
-                eval = import "${sources.nixpkgs}/nixos/lib/eval-config.nix" {
-                  system = builtins.currentSystem;
-                  specialArgs = {
-                    inherit sources;
-                  };
-                  modules = [ configuration ];
-                };
-                os = {
-                  inherit (eval) pkgs config options;
-                  system = eval.config.system.build.toplevel;
-                  inherit (eval.config.system.build) vm vmWithBootLoader;
-                };
               in
-              {
-                drv_path = os.config.system.build.toplevel.drvPath;
-                out_path = os.config.system.build.toplevel;
-              }
+              import ${pathToRoot}/deployment/nixos.nix { inherit configuration; }
               '
             )
             # instantiate the config in /nix/store
diff --git a/deployment/nixos.nix b/deployment/nixos.nix
index f2f0d019..65c5fe4b 100644
--- a/deployment/nixos.nix
+++ b/deployment/nixos.nix
@@ -4,11 +4,20 @@
 }:
 let
   sources = import ../npins;
-  os = import "${sources.nixpkgs}/nixos" { inherit system configuration; };
+  eval = import "${sources.nixpkgs}/nixos/lib/eval-config.nix" {
+    inherit system;
+    specialArgs = {
+      inherit sources;
+    };
+    modules = [ configuration ];
+  };
+  os = {
+    inherit (eval) pkgs config options;
+    system = eval.config.system.build.toplevel;
+    inherit (eval.config.system.build) vm vmWithBootLoader;
+  };
 in
 {
-  substituters = builtins.concatStringsSep " " os.config.nix.settings.substituters;
-  trusted_public_keys = builtins.concatStringsSep " " os.config.nix.settings.trusted-public-keys;
   drv_path = os.config.system.build.toplevel.drvPath;
   out_path = os.config.system.build.toplevel;
 }