Fix 2253

svartkanin · Nov 24, 2023 · b3ba2ae · b3ba2ae
1 parent f644632
commit b3ba2ae
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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 @@ def packages(self) -> List[GfxPackage]:
 				]
 			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
@@ -133,7 +133,7 @@ def install_network_config(
 			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
@@ -212,6 +212,7 @@ def install_gfx_driver(self, install_session: 'Installer', driver: Optional[GfxD
 			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 @@ def install_gfx_driver(self, install_session: 'Installer', driver: Optional[GfxD
 					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 @@ def install_profile_config(self, install_session: 'Installer', profile_config: P
 
 		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: