Merge pull request #273 from dylanmtaylor/patch-2

Restructure Graphics Driver Selection for 2.2.0

2 files changed, 22 insertions, 1 deletions

diff --git a/archinstall/lib/gfx_drivers.py b/archinstall/lib/gfx_drivers.py
index 7abb9db0..e1fb2824 100644
--- a/archinstall/lib/gfx_drivers.py
+++ b/archinstall/lib/gfx_drivers.py
@@ -1,5 +1,24 @@
 import archinstall
-def select_driver(options):
+
+AVAILABLE_DRIVERS = {
+	# Sub-dicts are layer-2 options to be selected
+	# and lists are a list of packages to be installed
+	'AMD / ATI' : {
+		'amd' : ['xf86-video-amdgpu'],
+		'ati' : ['xf86-video-ati']
+	},
+	'intel' : ['xf86-video-intel'],
+	'nvidia' : {
+		'open source' : ['xf86-video-nouveau'],
+		'proprietary' : ['nvidia']
+	},
+	'mesa' : ['mesa'],
+	'fbdev' : ['xf86-video-fbdev'],
+	'vesa' : ['xf86-video-vesa'],
+	'vmware' : ['xf86-video-vmware']
+}
+
+def select_driver(options=AVAILABLE_DRIVERS):
 	"""
 	Some what convoluted function, which's job is simple.
 	Select a graphics driver from a pre-defined set of popular options.
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index e9343cd1..5523b1e1 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -10,6 +10,8 @@ from .systemd import Networkd
 from .output import log, LOG_LEVELS
 from .storage import storage
 from .hardware import *
+from .gfx_drivers import *
+
 # Any package that the Installer() is responsible for (optional and the default ones)
 __packages__ = ["base", "base-devel", "linux", "linux-firmware", "efibootmgr", "nano", "ntp", "iwd"]
 __base_packages__ = __packages__[:6]