From a40925c3419627cbd08cf2d616deeb08dcf2c683 Mon Sep 17 00:00:00 2001
From: Else Someone <else@someonex.net>
Date: Mon, 2 Mar 2026 10:49:32 +0200
Subject: [PATCH] baseImage: overridable uvmsPkgs/inherit from scope

---
 pkgs/baseImage.nix     | 10 ++++++++--
 profiles/baseImage.nix |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/baseImage.nix b/pkgs/baseImage.nix
index 3e67ba9..8f59460 100644
--- a/pkgs/baseImage.nix
+++ b/pkgs/baseImage.nix
@@ -1,3 +1,9 @@
-{ nixos }:
+{ nixos, overrideScope }:
 
-nixos ../profiles/baseImage.nix
+nixos {
+    imports = [
+        ../profiles/baseImage.nix
+    ];
+    _module.args.uvmsPkgs = (overrideScope (fi: _: { uvmsPkgs = fi; })).uvmsPkgs;
+    _file = __curPos.file;
+}
diff --git a/profiles/baseImage.nix b/profiles/baseImage.nix
index 8ba9767..9d9b5ae 100644
--- a/profiles/baseImage.nix
+++ b/profiles/baseImage.nix
@@ -3,6 +3,7 @@
   config,
   modulesPath,
   pkgs,
+  uvmsPkgs,
   ...
 }:
 let
@@ -13,7 +14,6 @@ let
   inherit (config.system.boot.loader) initrdFile;
   inherit (config.boot.kernelPackages) kernel;
   kernelTarget = pkgs.stdenv.hostPlatform.linux-kernel.target;
-  uvmsPkgs = pkgs.callPackage ../pkgs { };
   waylandSock = "/run/user/1000/wayland-1";
   env = {
     XDG_RUNTIME_DIR = "/run/user/1000";
@@ -39,6 +39,7 @@ in
     ./on-failure.nix
   ];
   config = {
+    _module.args.uvmsPkgs = lib.mkDefault (pkgs.callPackage ../pkgs { });
     # some.failure-handler.enable = true;
     hardware.graphics.enable = true;
     boot.kernelPackages = pkgs.linuxPackagesFor uvmsPkgs.linux-uvm;