Merge branch 'master' into svintooo-fix

Sync branch svintooo-fix with latest code changes on master.

2 files changed, 4 insertions, 0 deletions

diff --git a/profiles/xfce4.py b/profiles/xfce4.py
index 8dbb04ec..89c04f7c 100644
--- a/profiles/xfce4.py
+++ b/profiles/xfce4.py
@@ -10,6 +10,8 @@ __packages__ = [
 	"pavucontrol",
 	"lightdm",
 	"lightdm-gtk-greeter",
+	"gvfs",
+	"network-manager-applet",
 ]
 
 
diff --git a/profiles/xorg.py b/profiles/xorg.py
index ce13664d..b8f33068 100644
--- a/profiles/xorg.py
+++ b/profiles/xorg.py
@@ -39,6 +39,8 @@ if __name__ == 'xorg':
 	try:
 		if "nvidia" in archinstall.storage.get("gfx_driver_packages", None):
 			if "linux-zen" in archinstall.storage['installation_session'].base_packages or "linux-lts" in archinstall.storage['installation_session'].base_packages:
+				for kernel in archinstall.storage['installation_session'].kernels:
+					archinstall.storage['installation_session'].add_additional_packages(f"{kernel}-headers") # Fixes https://github.com/archlinux/archinstall/issues/585
 				archinstall.storage['installation_session'].add_additional_packages("dkms")  # I've had kernel regen fail if it wasn't installed before nvidia-dkms
 				archinstall.storage['installation_session'].add_additional_packages("xorg-server xorg-xinit nvidia-dkms")
 			else: