diff --git a/mkosi.conf b/mkosi.conf index bfba08f8c..99efc6c1e 100644 --- a/mkosi.conf +++ b/mkosi.conf @@ -4,7 +4,7 @@ MinimumVersion=26~devel [Distribution] Distribution=ubuntu Release=resolute -Repositories=main,universe,restricted,multiverse +Repositories=main,universe,restricted [Content] InitrdProfiles=plymouth diff --git a/mkosi.images/driver-nvidia/mkosi.conf b/mkosi.images/driver-nvidia/mkosi.conf index 5bcf44bb0..295a9dfc8 100644 --- a/mkosi.images/driver-nvidia/mkosi.conf +++ b/mkosi.images/driver-nvidia/mkosi.conf @@ -21,8 +21,8 @@ BaseTrees=%O/base_%v BuildPackages= linux-headers-generic Packages= - linux-modules-nvidia-610-open-generic - libnvidia-gl-610 - nvidia-utils-610 - nvidia-driver-610-open + linux-modules-nvidia-595-open-generic + libnvidia-gl-595 + nvidia-utils-595 + nvidia-driver-595-open BuildScripts=get-module-only diff --git a/repos/common-files/etc/apt/preferences.d/restrict-proprietary b/repos/common-files/etc/apt/preferences.d/restrict-proprietary index 6905fa30c..e8395f642 100644 --- a/repos/common-files/etc/apt/preferences.d/restrict-proprietary +++ b/repos/common-files/etc/apt/preferences.d/restrict-proprietary @@ -1,12 +1,3 @@ -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