lewisgoddard · Oct 3, 2026 · Oct 2, 2026 · Oct 3, 2026 · Oct 3, 2026 · Oct 3, 2026
diff --git a/mkosi.conf b/mkosi.conf
@@ -4,7 +4,7 @@ MinimumVersion=26~devel
 [Distribution]
 Distribution=ubuntu
 Release=resolute
-Repositories=main,universe,restricted
+Repositories=main,universe,restricted,multiverse
 
 [Content]
 InitrdProfiles=plymouth

diff --git a/mkosi.conf.d/arch.arm64.conf b/mkosi.conf.d/arch.arm64.conf
@@ -12,6 +12,5 @@ Dependencies=
     ext-sdk
     ext-virt
     driver-nvidia-addon
-    driver-nvidia-modules
-    driver-nvidia-runtime
+    driver-nvidia
     modules-db
diff --git a/mkosi.conf.d/arch.x86-64.conf b/mkosi.conf.d/arch.x86-64.conf
@@ -12,9 +12,7 @@ Dependencies=
     ext-sdk
     ext-virt
     driver-nvidia-addon
-    driver-nvidia-modules
-    driver-nvidia-runtime
+    driver-nvidia
     driver-broadcom-addon
-    driver-broadcom-modules
-    driver-broadcom-runtime
+    driver-broadcom
     modules-db
diff --git a/mkosi.images/driver-broadcom-runtime/enable-runtime.chroot b/mkosi.images/driver-broadcom-runtime/enable-runtime.chroot
diff --git a/mkosi.images/driver-broadcom-runtime/mkosi.conf b/mkosi.images/driver-broadcom-runtime/mkosi.conf
diff --git a/...s/driver-broadcom-modules/get-module-only → mkosi.images/driver-broadcom/get-module-only b/...s/driver-broadcom-modules/get-module-only → mkosi.images/driver-broadcom/get-module-only
diff --git a/...images/driver-broadcom-modules/mkosi.conf → mkosi.images/driver-broadcom/mkosi.conf b/...images/driver-broadcom-modules/mkosi.conf → mkosi.images/driver-broadcom/mkosi.conf
@@ -1,15 +1,15 @@
-#broadcom-modules
+#driver-broadcom
 [Config]
 Dependencies=base
 
 [Match]
 Architecture=x86-64
 
 [Output]
-ImageId=driver-broadcom-modules
+ImageId=driver-broadcom
 Format=sysext
 Overlay=yes
-Output=driver-broadcom-modules-%a_%v
+Output=driver-broadcom-%a_%v
 CompressOutput=false
 
 [Validation]

diff --git a/mkosi.images/driver-nvidia-runtime/mkosi.conf b/mkosi.images/driver-nvidia-runtime/mkosi.conf
diff --git a/...ges/driver-nvidia-modules/get-module-only → mkosi.images/driver-nvidia/get-module-only b/...ges/driver-nvidia-modules/get-module-only → mkosi.images/driver-nvidia/get-module-only
diff --git a/...i.images/driver-nvidia-modules/mkosi.conf → mkosi.images/driver-nvidia/mkosi.conf b/...i.images/driver-nvidia-modules/mkosi.conf → mkosi.images/driver-nvidia/mkosi.conf
@@ -1,12 +1,12 @@
-#nvidia-modules
+#driver-nvidia
 [Config]
 Dependencies=base
 
 [Output]
-ImageId=driver-nvidia-modules
+ImageId=driver-nvidia
 Format=sysext
 Overlay=yes
-Output=driver-nvidia-modules-%a_%v
+Output=driver-nvidia-%a_%v
 CompressOutput=false
 
 [Validation]
@@ -18,5 +18,11 @@ Environment=DEB_BUILD_PROFILES=nokerneldkms
 [Content]
 Bootable=no
 BaseTrees=%O/base_%v
-Packages=linux-modules-nvidia-590-open-generic
+BuildPackages=
+    linux-headers-generic
+Packages=
+    linux-modules-nvidia-610-open-generic
+    libnvidia-gl-610
+    nvidia-utils-610
+    nvidia-driver-610-open
 BuildScripts=get-module-only
diff --git a/mkosi.images/modules-db/mkosi.conf.d/arch.arm64.conf b/mkosi.images/modules-db/mkosi.conf.d/arch.arm64.conf
@@ -1,5 +1,7 @@
 [Config]
-Dependencies=base
+Dependencies=
+    base
+    driver-nvidia
 
 [Match]
 Architecture=arm64
@@ -13,5 +15,5 @@ CompressOutput=false
 Bootable=false
 BaseTrees=
     %O/base_%v
-    %O/driver-nvidia-modules-%a_%v.raw
+    %O/driver-nvidia-%a_%v.raw
 Output=modules-db_%a-%v
diff --git a/mkosi.images/modules-db/mkosi.conf.d/arch.x86-64.conf b/mkosi.images/modules-db/mkosi.conf.d/arch.x86-64.conf
@@ -1,5 +1,8 @@
 [Config]
-Dependencies=base
+Dependencies=
+    base
+    driver-broadcom
+    driver-nvidia
 
 [Match]
 Architecture=x86-64
@@ -13,6 +16,6 @@ CompressOutput=false
 Bootable=false
 BaseTrees=
     %O/base_%v
-    %O/driver-broadcom-modules-%a_%v.raw
-    %O/driver-nvidia-modules-%a_%v.raw
+    %O/driver-broadcom-%a_%v.raw
+    %O/driver-nvidia-%a_%v.raw
 Output=modules-db_%a-%v
diff --git a/mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-broadcom-modules.transfer b/mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-broadcom-modules.transfer
diff --git a/...update.d/driver-broadcom-runtime.transfer → .../lib/sysupdate.d/driver-broadcom.transfer b/...update.d/driver-broadcom-runtime.transfer → .../lib/sysupdate.d/driver-broadcom.transfer
@@ -6,10 +6,10 @@ Verify=yes
 [Source]
 Type=url-file
 Path=https://%W.updates.elementaryos.org/%a/ext
-MatchPattern=driver-broadcom-runtime-%a_@v.raw.zst
+MatchPattern=driver-broadcom-%a_@v.raw.zst
 
 [Target]
 Type=regular-file
 Path=/var/lib/extensions/
-MatchPattern=driver-broadcom-runtime-%a_@v.raw
+MatchPattern=driver-broadcom-%a_@v.raw
 InstancesMax=2
diff --git a/mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-nvidia-runtime.transfer b/mkosi.images/sysupdate/mkosi.extra/usr/lib/sysupdate.d/driver-nvidia-runtime.transfer
diff --git a/...ysupdate.d/driver-nvidia-modules.transfer → ...sr/lib/sysupdate.d/driver-nvidia.transfer b/...ysupdate.d/driver-nvidia-modules.transfer → ...sr/lib/sysupdate.d/driver-nvidia.transfer
@@ -6,10 +6,10 @@ Verify=yes
 [Source]
 Type=url-file
 Path=https://%W.updates.elementaryos.org/%a/ext
-MatchPattern=driver-nvidia-modules-%a_@v.raw.zst
+MatchPattern=driver-nvidia-%a_@v.raw.zst
 
 [Target]
 Type=regular-file
 Path=/var/lib/extensions/
-MatchPattern=driver-nvidia-modules-%a_@v.raw
+MatchPattern=driver-nvidia-%a_@v.raw
 InstancesMax=2
diff --git a/repos/common-files/etc/apt/preferences.d/restrict-proprietary b/repos/common-files/etc/apt/preferences.d/restrict-proprietary
@@ -0,0 +1,17 @@
+Explanation: Block everything by default in multiverse, except NVIDIA.
+Package: *
+Pin: release c=multiverse
+Pin-Priority: -1
+
+Package: /.*nvidia.*/
+Pin: release c=multiverse
+Pin-Priority: 500
+
+Explanation: Block everything by default in restricted, except NVIDIA and Broadcom.
+Package: *
+Pin: release c=restricted
+Pin-Priority: -1
+
+Package: /.*(nvidia|broadcom).*/
+Pin: release c=restricted
+Pin-Priority: 500