renamed driver.py to gfx_driver.py. also explictly check if we are using the propritery nvidia drivers

3 files changed, 5 insertions, 5 deletions

diff --git a/profiles/sway.py b/profiles/sway.py
index 7a0b9beb..edc3b744 100644
--- a/profiles/sway.py
+++ b/profiles/sway.py
@@ -16,7 +16,7 @@ def _prep_function(*args, **kwargs):
 		if hasattr(imported, '_prep_function'):
 			return imported._prep_function()
 		else:
-			print('Deprecated (??): xorg profile has no _prep_function() anymore')
+			print('Deprecated (??): wayland profile has no _prep_function() anymore')
 
 def _post_install(*args, **kwargs):
 	choice = input("Would you like to autostart sway on login [Y/n]: ")
@@ -37,8 +37,8 @@ def _post_install(*args, **kwargs):
 # or through conventional import kde
 if __name__ == 'sway':
 	# Install dependency profiles
-    if "nvidia" in _gfx_driver_packages:
-        raise archinstall.lib.exceptions.HardwareIncompatibilityError("sway does not support nvidia cards")
+    if _gfx_driver_packages == 'nvidia':
+        raise archinstall.lib.exceptions.HardwareIncompatibilityError("sway does not the prorpitery nvidia driver try using nouveau")
     else:
         installation.install_profile('wayland')
 
diff --git a/profiles/wayland.py b/profiles/wayland.py
index 3107055c..8edae3c2 100644
--- a/profiles/wayland.py
+++ b/profiles/wayland.py
@@ -29,7 +29,7 @@ def _prep_function(*args, **kwargs):
 	print('You need to select which graphics card you\'re using.')
 	print('This in order to setup the required graphics drivers.')
 
-	__builtins__['_gfx_driver_packages'] = archinstall.lib.drivers.select_driver(AVAILABLE_DRIVERS)
+	__builtins__['_gfx_driver_packages'] = archinstall.lib.gfx_drivers.select_driver(AVAILABLE_DRIVERS)
 
 	# TODO: Add language section and/or merge it with the locale selected
 	#       earlier in for instance guided.py installer.
diff --git a/profiles/xorg.py b/profiles/xorg.py
index 79418d1d..542558c6 100644
--- a/profiles/xorg.py
+++ b/profiles/xorg.py
@@ -31,7 +31,7 @@ def _prep_function(*args, **kwargs):
 	print('You need to select which graphics card you\'re using.')
 	print('This in order to setup the required graphics drivers.')
 
-	__builtins__['_gfx_driver_packages'] = archinstall.lib.drivers.select_driver(AVAILABLE_DRIVERS)
+	__builtins__['_gfx_driver_packages'] = archinstall.lib.gfx_drivers.select_driver(AVAILABLE_DRIVERS)
 
 	# TODO: Add language section and/or merge it with the locale selected
 	#       earlier in for instance guided.py installer.