Merge branch 'master' into packages

4 files changed, 14 insertions, 14 deletions

diff --git a/profiles/52-54-00-12-34-56.py b/profiles/52-54-00-12-34-56.py
index ed2c9d78..442e053c 100644
--- a/profiles/52-54-00-12-34-56.py
+++ b/profiles/52-54-00-12-34-56.py
@@ -1,7 +1,8 @@
 import archinstall
 import json
 import urllib.request
-import git
+
+__packages__ = ['nano', 'wget', 'git']
 
 # Unmount and close previous runs (Mainly only used for re-runs, but won't hurt.)
 archinstall.sys_command(f'umount -R /mnt', suppress_errors=True)
@@ -30,22 +31,19 @@ with archinstall.Filesystem(harddrive) as fs:
 			if installation.minimal_installation():
 				installation.add_bootloader()
 
-				installation.add_additional_packages(['nano', 'wget', 'git'])
+				installation.add_additional_packages(__packages__)
 				installation.install_profile('awesome')
 
-				installation.user_create('anton', 'test')
+				installation.user_create('devel', 'devel')
 				installation.user_set_pw('root', 'toor')
 
-				repo = git.Repo('./')
-				commit = repo.head.commit.hexsha[:7]
-
-				print(f'Submitting {commit}: success')
+				print(f'Submitting {archinstall.__version__}: success')
 
 				conditions = {
 					"project": "archinstall",
 					"profile": "52-54-00-12-34-56",
 					"status": "success",
-					"commit": commit
+					"version": archinstall.__version__
 				}
 				req = urllib.request.Request("https://api.archlinux.life/build/success",
 												data=json.dumps(conditions).encode('utf8'),
diff --git a/profiles/awesome.py b/profiles/awesome.py
index 694a4f9d..a5dedccd 100644
--- a/profiles/awesome.py
+++ b/profiles/awesome.py
@@ -6,7 +6,7 @@ is_top_level_profile = False
 
 # New way of defining packages for a profile, which is iterable and can be used out side
 # of the profile to get a list of "what packages will be installed".
-__packages__ = ['nemo', 'gpicview-gtk3', 'scrot', 'alacritty']
+__packages__ = ['nemo', 'gpicview-gtk3', 'main', 'alacritty']
 
 def _prep_function(*args, **kwargs):
 	"""
diff --git a/profiles/i3.py b/profiles/i3.py
index f071714a..4d400468 100644
--- a/profiles/i3.py
+++ b/profiles/i3.py
@@ -6,7 +6,7 @@ is_top_level_profile = False
 
 # New way of defining packages for a profile, which is iterable and can be used out side
 # of the profile to get a list of "what packages will be installed".
-__packages__ = ['i3lock', 'i3status', 'i3blocks', 'xterm']
+__packages__ = ['i3lock', 'i3status', 'i3blocks', 'xterm', 'lightdm-gtk-greeter', 'lightdm']
 
 def _prep_function(*args, **kwargs):
 	"""
@@ -48,13 +48,13 @@ if __name__ == 'i3':
 	"""
 	
 	# Install common packages for all i3 configurations
-	installation.add_additional_packages(__packages__)
+	installation.add_additional_packages(__packages__[:4])
 
 	# Install dependency profiles
 	installation.install_profile('xorg')
 
-	# gaps is installed by deafult so we are overriding it here
-	installation.add_additional_packages("lightdm-gtk-greeter lightdm")
+	# gaps is installed by deafult so we are overriding it here with lightdm
+	installation.add_additional_packages(__packages__[4:])
 
 	# Auto start lightdm for all users
 	installation.enable_service('lightdm')
diff --git a/profiles/xorg.py b/profiles/xorg.py
index cd89668d..7546a01b 100644
--- a/profiles/xorg.py
+++ b/profiles/xorg.py
@@ -1,10 +1,12 @@
 # A system with "xorg" installed
 
 import os
-from archinstall import generic_select, sys_command, RequirementError
 import archinstall
+
 is_top_level_profile = True
 
+__packages__ = ['dkms', 'xorg-server', 'xorg-xinit', 'nvidia-dkms', 'xorg-server', *archinstall.lib.hardware.__packages__]
+
 def _prep_function(*args, **kwargs):
 	"""
 	Magic function called by the importing installer