Merge branch 'torxed-v2.2.0' into torxed-v2.2.0

1 files changed, 46 insertions, 8 deletions

diff --git a/archinstall/lib/hardware.py b/archinstall/lib/hardware.py
index 10f3970f..d6cf982c 100644
--- a/archinstall/lib/hardware.py
+++ b/archinstall/lib/hardware.py
@@ -1,19 +1,42 @@
-import os, subprocess
+import os, subprocess, json
 from .general import sys_command
 from .networking import list_interfaces, enrichIfaceTypes
+from typing import Optional
 
-def hasWifi():
+AVAILABLE_GFX_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 hasWifi()->bool:
 	return 'WIRELESS' in enrichIfaceTypes(list_interfaces().values()).values()
 
-def hasAMDCPU():
+def hasAMDCPU()->bool:
 	if subprocess.check_output("lscpu | grep AMD", shell=True).strip().decode():
 		return True
 	return False
+def hasIntelCPU()->bool:
+	if subprocess.check_output("lscpu | grep Intel", shell=True).strip().decode():
+		return True
+	return False
 
-def hasUEFI():
+def hasUEFI()->bool:
 	return os.path.isdir('/sys/firmware/efi')
 
-def graphicsDevices():
+def graphicsDevices()->dict:
 	cards = {}
 	for line in sys_command(f"lspci"):
 		if b' VGA ' in line:
@@ -21,13 +44,28 @@ def graphicsDevices():
 			cards[identifier.strip().lower().decode('UTF-8')] = line
 	return cards
 
-def hasNvidiaGraphics():
+def hasNvidiaGraphics()->bool:
 	return any('nvidia' in x for x in graphicsDevices())
 
-def hasAmdGraphics():
+def hasAmdGraphics()->bool:
 	return any('amd' in x for x in graphicsDevices())
 
-def hasIntelGraphics():
+def hasIntelGraphics()->bool:
 	return any('intel' in x for x in graphicsDevices())
 
+
+def cpuVendor()-> Optional[str]:
+	cpu_info = json.loads(subprocess.check_output("lscpu -J", shell=True).decode('utf-8'))['lscpu']
+	for info in cpu_info:
+		if info.get('field',None):
+			if info.get('field',None) == "Vendor ID:":
+				return info.get('data',None)
+
+def isVM() -> bool:
+	try:
+		subprocess.check_call(["systemd-detect-virt"]) # systemd-detect-virt issues a none 0 exit code if it is not on a virtual machine
+		return True
+	except:
+		return False
+
 # TODO: Add more identifiers