From b0c8f33de6e1880a7b2d8268c8365dad8decd7c5 Mon Sep 17 00:00:00 2001 From: Daniel Girtler Date: Fri, 24 Nov 2023 17:59:12 +1100 Subject: Fix 2253 (#2259) Co-authored-by: Daniel Girtler --- archinstall/lib/hardware.py | 4 +--- archinstall/lib/models/network_configuration.py | 2 +- archinstall/lib/profile/profiles_handler.py | 4 +++- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'archinstall') diff --git a/archinstall/lib/hardware.py b/archinstall/lib/hardware.py index d9342a98..9433f96c 100644 --- a/archinstall/lib/hardware.py +++ b/archinstall/lib/hardware.py @@ -42,7 +42,6 @@ class GfxPackage(Enum): LibvaMesaDriver = 'libva-mesa-driver' Mesa = "mesa" Nvidia = 'nvidia' - NvidiaDKMS = 'nvidia-dkms' NvidiaOpen = 'nvidia-open' VulkanIntel = 'vulkan-intel' VulkanRadeon = 'vulkan-radeon' @@ -110,8 +109,7 @@ class GfxDriver(Enum): ] case GfxDriver.NvidiaProprietary: return [ - GfxPackage.Nvidia, - GfxPackage.NvidiaDKMS + GfxPackage.Nvidia ] case GfxDriver.VMOpenSource: return [ diff --git a/archinstall/lib/models/network_configuration.py b/archinstall/lib/models/network_configuration.py index 1777df62..b726bb73 100644 --- a/archinstall/lib/models/network_configuration.py +++ b/archinstall/lib/models/network_configuration.py @@ -133,7 +133,7 @@ class NetworkConfiguration: case NicType.NM: installation.add_additional_packages(["networkmanager"]) if profile_config and profile_config.profile: - if profile_config.profile.is_desktop_type_profile(): + if profile_config.profile.is_desktop_profile(): installation.add_additional_packages(["network-manager-applet"]) installation.enable_service('NetworkManager.service') case NicType.MANUAL: diff --git a/archinstall/lib/profile/profiles_handler.py b/archinstall/lib/profile/profiles_handler.py index 515cdfe9..66d4b8cb 100644 --- a/archinstall/lib/profile/profiles_handler.py +++ b/archinstall/lib/profile/profiles_handler.py @@ -212,6 +212,7 @@ class ProfileHandler: if driver is not None: driver_pkgs = driver.packages() pkg_names = [p.value for p in driver_pkgs] + for driver_pkg in {GfxPackage.Nvidia, GfxPackage.NvidiaOpen} & set(driver_pkgs): for kernel in {"linux-lts", "linux-zen"} & set(install_session.kernels): # Fixes https://github.com/archlinux/archinstall/issues/585 @@ -221,6 +222,7 @@ class ProfileHandler: install_session.add_additional_packages(['dkms', 'xorg-server', 'xorg-xinit', f'{driver_pkg.value}-dkms']) # Return after first driver match, since it is impossible to use both simultaneously. return + if 'amdgpu' in driver_pkgs: # The order of these two are important if amdgpu is installed #808 if 'amdgpu' in install_session.modules: @@ -245,7 +247,7 @@ class ProfileHandler: profile.install(install_session) - if profile_config.gfx_driver and (profile.is_xorg_type_profile() or profile.is_desktop_type_profile()): + if profile_config.gfx_driver and (profile.is_xorg_type_profile() or profile.is_desktop_profile()): self.install_gfx_driver(install_session, profile_config.gfx_driver) if profile_config.greeter: -- cgit v1.2.3-54-g00ecf