From 22408f98db0f895abccfd68883b18c22f3c90713 Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Sun, 31 Aug 2025 17:34:03 +0200
Subject: [PATCH] simplify deployment/nixos.nix

---
 deployment/check/data-model-ssh/nixosTest.nix |  4 ++--
 deployment/nixos.nix                          | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/deployment/check/data-model-ssh/nixosTest.nix b/deployment/check/data-model-ssh/nixosTest.nix
index dbc79fbf..e800ab7b 100644
--- a/deployment/check/data-model-ssh/nixosTest.nix
+++ b/deployment/check/data-model-ssh/nixosTest.nix
@@ -58,10 +58,10 @@ in
     };
 
   extraTestScript = ''
-    with subtest("ssh: Check the status before deployment"):
+    with subtest("Check the status before deployment"):
       ssh.fail("hello 1>&2")
 
-    with subtest("ssh: Run the deployment"):
+    with subtest("Run the deployment"):
       deployer.succeed("""
         set -euo pipefail
 
diff --git a/deployment/nixos.nix b/deployment/nixos.nix
index c5228106..1a735222 100644
--- a/deployment/nixos.nix
+++ b/deployment/nixos.nix
@@ -11,13 +11,15 @@ let
     };
     modules = [ configuration ];
   };
-  os = {
-    inherit (eval) pkgs config options;
-    system = eval.config.system.build.toplevel;
-    inherit (eval.config.system.build) vm vmWithBootLoader;
-  };
+  toplevel =
+    {
+      inherit (eval) pkgs config options;
+      system = eval.config.system.build.toplevel;
+      inherit (eval.config.system.build) vm vmWithBootLoader;
+    }
+    .config.system.build.toplevel;
 in
 {
-  drv_path = os.config.system.build.toplevel.drvPath;
-  out_path = os.config.system.build.toplevel;
+  drv_path = toplevel.drvPath;
+  out_path = toplevel;
 }