From e9d5cd1a112111a7fff48874bd39abaaf6f3e847 Mon Sep 17 00:00:00 2001
From: Dylan Taylor <dylan@dylanmtaylor.com>
Date: Wed, 28 Apr 2021 11:07:18 -0400
Subject: Rework budgie to use package definition

---
 profiles/budgie.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/profiles/budgie.py b/profiles/budgie.py
index 6c5475ae..fc061cd2 100644
--- a/profiles/budgie.py
+++ b/profiles/budgie.py
@@ -4,6 +4,9 @@ import archinstall
 
 is_top_level_profile = False
 
+# "It is recommended also to install the gnome group, which contains applications required for the standard GNOME experience." - Arch Wiki 
+__packages__ = ["budgie-desktop", "lightdm", "lightdm-gtk-greeter", "gnome"]
+
 def _prep_function(*args, **kwargs):
 	"""
 	Magic function called by the importing installer
@@ -27,8 +30,7 @@ if __name__ == 'budgie':
 	# Install dependency profiles
 	installation.install_profile('xorg')
 
-	# Install the application budgie from the template under /applications/
-	budgie = archinstall.Application(installation, 'budgie')
-	budgie.install()
+	# Install the Budgie packages
+	installation.add_additional_packages(__packages__)
 
 	installation.enable_service('lightdm') # Light Display Manager
-- 
cgit v1.2.3-70-g09d2


From f319308d37ddf3dbfa6d62c500d61266f55771cd Mon Sep 17 00:00:00 2001
From: Dylan Taylor <dylan@dylanmtaylor.com>
Date: Wed, 28 Apr 2021 11:08:50 -0400
Subject: Remove application profiles that just install additional packages and
 do not do anything else to customize or configure.

---
 profiles/applications/alacritty.py | 3 ---
 profiles/applications/budgie.py    | 4 ----
 profiles/applications/cinnamon.py  | 3 ---
 profiles/applications/deepin.py    | 5 -----
 profiles/applications/gnome.py     | 4 ----
 profiles/applications/i3-gaps.py   | 2 --
 profiles/applications/i3-wm.py     | 2 --
 profiles/applications/kde.py       | 5 -----
 profiles/applications/lxqt.py      | 3 ---
 profiles/applications/mate.py      | 3 ---
 profiles/applications/sway.py      | 3 ---
 profiles/applications/xfce4.py     | 3 ---
 12 files changed, 40 deletions(-)
 delete mode 100644 profiles/applications/alacritty.py
 delete mode 100644 profiles/applications/budgie.py
 delete mode 100644 profiles/applications/cinnamon.py
 delete mode 100644 profiles/applications/deepin.py
 delete mode 100644 profiles/applications/gnome.py
 delete mode 100644 profiles/applications/i3-gaps.py
 delete mode 100644 profiles/applications/i3-wm.py
 delete mode 100644 profiles/applications/kde.py
 delete mode 100644 profiles/applications/lxqt.py
 delete mode 100644 profiles/applications/mate.py
 delete mode 100644 profiles/applications/sway.py
 delete mode 100644 profiles/applications/xfce4.py

diff --git a/profiles/applications/alacritty.py b/profiles/applications/alacritty.py
deleted file mode 100644
index aab64bb4..00000000
--- a/profiles/applications/alacritty.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import archinstall
-
-installation.add_additional_packages("alacritty")
\ No newline at end of file
diff --git a/profiles/applications/budgie.py b/profiles/applications/budgie.py
deleted file mode 100644
index ccec4e14..00000000
--- a/profiles/applications/budgie.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import archinstall
-
-# "It is recommended also to install the gnome group, which contains applications required for the standard GNOME experience." - Arch Wiki 
-installation.add_additional_packages("budgie-desktop lightdm lightdm-gtk-greeter gnome")
\ No newline at end of file
diff --git a/profiles/applications/cinnamon.py b/profiles/applications/cinnamon.py
deleted file mode 100644
index 0a1d9cc2..00000000
--- a/profiles/applications/cinnamon.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import archinstall
-
-installation.add_additional_packages("cinnamon system-config-printer gnome-keyring gnome-terminal blueberry metacity lightdm lightdm-gtk-greeter")
diff --git a/profiles/applications/deepin.py b/profiles/applications/deepin.py
deleted file mode 100644
index 0db1572d..00000000
--- a/profiles/applications/deepin.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import archinstall
-
-packages = "deepin deepin-terminal deepin-editor"
-
-installation.add_additional_packages(packages)
diff --git a/profiles/applications/gnome.py b/profiles/applications/gnome.py
deleted file mode 100644
index e26290dc..00000000
--- a/profiles/applications/gnome.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import archinstall
-
-installation.add_additional_packages("gnome gnome-tweaks gdm")
-# Note: gdm should be part of the gnome group, but adding it here for clarity
diff --git a/profiles/applications/i3-gaps.py b/profiles/applications/i3-gaps.py
deleted file mode 100644
index 4daed7ad..00000000
--- a/profiles/applications/i3-gaps.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import archinstall
-installation.add_additional_packages("i3-gaps")
\ No newline at end of file
diff --git a/profiles/applications/i3-wm.py b/profiles/applications/i3-wm.py
deleted file mode 100644
index e7838a64..00000000
--- a/profiles/applications/i3-wm.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import archinstall
-installation.add_additional_packages("i3-wm")
\ No newline at end of file
diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py
deleted file mode 100644
index af1e6597..00000000
--- a/profiles/applications/kde.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import archinstall
-packages = "plasma-meta konsole kate dolphin sddm plasma-wayland-session"
-if "nvidia" in _gfx_driver_packages:
-	packages = packages + " egl-wayland"
-installation.add_additional_packages(packages)
diff --git a/profiles/applications/lxqt.py b/profiles/applications/lxqt.py
deleted file mode 100644
index 2099f3fa..00000000
--- a/profiles/applications/lxqt.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import archinstall
-
-installation.add_additional_packages("lxqt breeze-icons oxygen-icons xdg-utils ttf-freefont leafpad slock sddm")
diff --git a/profiles/applications/mate.py b/profiles/applications/mate.py
deleted file mode 100644
index 24d6be47..00000000
--- a/profiles/applications/mate.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import archinstall
-
-installation.add_additional_packages("mate mate-extra lightdm lightdm-gtk-greeter") 
\ No newline at end of file
diff --git a/profiles/applications/sway.py b/profiles/applications/sway.py
deleted file mode 100644
index 59921aa0..00000000
--- a/profiles/applications/sway.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import archinstall
-__packages__ = "sway swaylock swayidle waybar dmenu light grim slurp pavucontrol alacritty"
-installation.add_additional_packages(__packages__)
diff --git a/profiles/applications/xfce4.py b/profiles/applications/xfce4.py
deleted file mode 100644
index 9f4260da..00000000
--- a/profiles/applications/xfce4.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import archinstall
-__packages__ = "xfce4 xfce4-goodies lightdm lightdm-gtk-greeter"
-installation.add_additional_packages(__packages__)
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 8706b48097f0fdb8eab7a612378bc3352ec00c18 Mon Sep 17 00:00:00 2001
From: Dylan Taylor <dylan@dylanmtaylor.com>
Date: Wed, 28 Apr 2021 11:10:08 -0400
Subject: Restore kde.py

---
 profiles/applications/kde.py | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 profiles/applications/kde.py

diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py
new file mode 100644
index 00000000..af1e6597
--- /dev/null
+++ b/profiles/applications/kde.py
@@ -0,0 +1,5 @@
+import archinstall
+packages = "plasma-meta konsole kate dolphin sddm plasma-wayland-session"
+if "nvidia" in _gfx_driver_packages:
+	packages = packages + " egl-wayland"
+installation.add_additional_packages(packages)
-- 
cgit v1.2.3-70-g09d2


From 2d4326b6c5dd117094dd68f533bb15e997ae1571 Mon Sep 17 00:00:00 2001
From: Dylan Taylor <dylan@dylanmtaylor.com>
Date: Wed, 28 Apr 2021 11:11:36 -0400
Subject: Rework how alacritty is installed for awesome

---
 profiles/applications/kde.py | 3 +++
 profiles/awesome.py          | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py
index af1e6597..150fc0e3 100644
--- a/profiles/applications/kde.py
+++ b/profiles/applications/kde.py
@@ -1,5 +1,8 @@
 import archinstall
+
 packages = "plasma-meta konsole kate dolphin sddm plasma-wayland-session"
+
 if "nvidia" in _gfx_driver_packages:
 	packages = packages + " egl-wayland"
+
 installation.add_additional_packages(packages)
diff --git a/profiles/awesome.py b/profiles/awesome.py
index cbd52a3c..694a4f9d 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']
+__packages__ = ['nemo', 'gpicview-gtk3', 'scrot', 'alacritty']
 
 def _prep_function(*args, **kwargs):
 	"""
@@ -35,9 +35,6 @@ if __name__ == 'awesome':
 
 	installation.add_additional_packages(__packages__)
 
-	alacritty = archinstall.Application(installation, 'alacritty')
-	alacritty.install()
-
 	# TODO: Copy a full configuration to ~/.config/awesome/rc.lua instead.
 	with open(f'{installation.target}/etc/xdg/awesome/rc.lua', 'r') as fh:
 		awesome_lua = fh.read()
-- 
cgit v1.2.3-70-g09d2


From 23a9e9f69a76adb1015ab80ea84ffdae86cefb09 Mon Sep 17 00:00:00 2001
From: Dylan Taylor <dylan@dylanmtaylor.com>
Date: Wed, 28 Apr 2021 11:13:16 -0400
Subject: Change how i3 configurations are installed

---
 profiles/i3.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/profiles/i3.py b/profiles/i3.py
index b82c03d6..f071714a 100644
--- a/profiles/i3.py
+++ b/profiles/i3.py
@@ -60,5 +60,4 @@ if __name__ == 'i3':
 	installation.enable_service('lightdm')
 
 	# install the i3 group now
-	i3 = archinstall.Application(installation, archinstall.storage['_i3_configuration'])
-	i3.install()
+	installation.add_additional_packages(installation, archinstall.storage['_i3_configuration'])
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From f91c0137d5f9a5f01229f21e62e81e52e41635ce Mon Sep 17 00:00:00 2001
From: Dylan Taylor <dylan@dylanmtaylor.com>
Date: Wed, 28 Apr 2021 11:14:18 -0400
Subject: Remove refs to application profiles that were removed

---
 profiles/cinnamon.py | 5 ++---
 profiles/deepin.py   | 5 ++---
 profiles/gnome.py    | 5 ++---
 profiles/lxqt.py     | 5 ++---
 profiles/mate.py     | 5 ++---
 profiles/sway.py     | 5 ++---
 profiles/xfce4.py    | 5 ++---
 7 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/profiles/cinnamon.py b/profiles/cinnamon.py
index 91a59811..a8b89031 100644
--- a/profiles/cinnamon.py
+++ b/profiles/cinnamon.py
@@ -27,8 +27,7 @@ if __name__ == 'cinnamon':
 	# Install dependency profiles
 	installation.install_profile('xorg')
 
-	# Install the application cinnamon from the template under /applications/
-	cinnamon = archinstall.Application(installation, 'cinnamon')
-	cinnamon.install()
+	# Install the Cinnamon packages
+	installation.add_additional_packages(__packages__)
 
 	installation.enable_service('lightdm') # Light Display Manager
diff --git a/profiles/deepin.py b/profiles/deepin.py
index 52bcdde5..f476f7e3 100644
--- a/profiles/deepin.py
+++ b/profiles/deepin.py
@@ -29,9 +29,8 @@ if __name__ == 'deepin':
 	# Install dependency profiles
 	installation.install_profile('xorg')
 
-	# Install the application deepin from the template under /applications/
-	deepin = archinstall.Application(installation, 'deepin')
-	deepin.install()
+	# Install the Deepin packages
+	installation.add_additional_packages(__packages__)
 
 	# Enable autostart of Deepin for all users
 	installation.enable_service('lightdm')
diff --git a/profiles/gnome.py b/profiles/gnome.py
index c75cafee..cc80a606 100644
--- a/profiles/gnome.py
+++ b/profiles/gnome.py
@@ -28,9 +28,8 @@ if __name__ == 'gnome':
 	# Install dependency profiles
 	installation.install_profile('xorg')
 
-	# Install the application gnome from the template under /applications/
-	gnome = archinstall.Application(installation, 'gnome')
-	gnome.install()
+	# Install the GNOME packages
+	installation.add_additional_packages(__packages__)
 
 	installation.enable_service('gdm') # Gnome Display Manager
 	# We could also start it via xinitrc since we do have Xorg,
diff --git a/profiles/lxqt.py b/profiles/lxqt.py
index 871488ee..e1ac8ab7 100644
--- a/profiles/lxqt.py
+++ b/profiles/lxqt.py
@@ -28,8 +28,7 @@ if __name__ == 'lxqt':
 	# Install dependency profiles
 	installation.install_profile('xorg')
 
-	# Install the application xfce4 from the template under /applications/
-	xfce = archinstall.Application(installation, 'lxqt')
-	xfce.install()
+	# Install the LXQt packages
+	installation.add_additional_packages(__packages__)
 
 	installation.enable_service('sddm') # SDDM Display Manager
diff --git a/profiles/mate.py b/profiles/mate.py
index b4c697b1..3b48d0ab 100644
--- a/profiles/mate.py
+++ b/profiles/mate.py
@@ -27,8 +27,7 @@ if __name__ == 'mate':
 	# Install dependency profiles
 	installation.install_profile('xorg')
 
-	# Install the application mate from the template under /applications/
-	mate = archinstall.Application(installation, 'mate')
-	mate.install()
+	# Install the MATE packages
+	installation.add_additional_packages(__packages__)
 
 	installation.enable_service('lightdm') # Light Display Manager
diff --git a/profiles/sway.py b/profiles/sway.py
index c3a6e31a..84ea049b 100644
--- a/profiles/sway.py
+++ b/profiles/sway.py
@@ -24,6 +24,5 @@ def _prep_function(*args, **kwargs):
 # through importlib.util.spec_from_file_location("sway", "/somewhere/sway.py")
 # or through conventional import sway
 if __name__ == 'sway':
-	# Install the application sway from the template under /applications/
-	sway = archinstall.Application(installation, 'sway')
-	sway.install()
+	# Install the Sway packages
+	installation.add_additional_packages(__packages__)
diff --git a/profiles/xfce4.py b/profiles/xfce4.py
index fee8c37a..ffe4a3c0 100644
--- a/profiles/xfce4.py
+++ b/profiles/xfce4.py
@@ -28,8 +28,7 @@ if __name__ == 'xfce4':
 	# Install dependency profiles
 	installation.install_profile('xorg')
 
-	# Install the application xfce4 from the template under /applications/
-	xfce = archinstall.Application(installation, 'xfce4')
-	xfce.install()
+	# Install the XFCE4 packages
+	installation.add_additional_packages(__packages__)
 
 	installation.enable_service('lightdm') # Light Display Manager
-- 
cgit v1.2.3-70-g09d2


From 6013e06fb134eb6d07764aea778399baccd49d21 Mon Sep 17 00:00:00 2001
From: Dylan Taylor <dylan@dylanmtaylor.com>
Date: Wed, 28 Apr 2021 11:20:00 -0400
Subject: Add packages to top of each desktop profile

---
 profiles/cinnamon.py | 2 ++
 profiles/deepin.py   | 1 +
 profiles/gnome.py    | 3 +++
 profiles/kde.py      | 2 ++
 profiles/lxqt.py     | 2 ++
 profiles/mate.py     | 2 ++
 profiles/sway.py     | 2 ++
 profiles/xfce4.py    | 2 ++
 8 files changed, 16 insertions(+)

diff --git a/profiles/cinnamon.py b/profiles/cinnamon.py
index a8b89031..4ca9cfed 100644
--- a/profiles/cinnamon.py
+++ b/profiles/cinnamon.py
@@ -4,6 +4,8 @@ import archinstall
 
 is_top_level_profile = False
 
+__packages__ = ["cinnamon", "system-config-printer", "gnome-keyring", "gnome-terminal", "blueberry", "metacity", "lightdm", "lightdm-gtk-greeter"]
+
 def _prep_function(*args, **kwargs):
 	"""
 	Magic function called by the importing installer
diff --git a/profiles/deepin.py b/profiles/deepin.py
index f476f7e3..ce59a699 100644
--- a/profiles/deepin.py
+++ b/profiles/deepin.py
@@ -4,6 +4,7 @@ import archinstall, os
 
 is_top_level_profile = False
 
+__packages__ = ["deepin", "deepin-terminal", "deepin-editor"]
 
 def _prep_function(*args, **kwargs):
 	"""
diff --git a/profiles/gnome.py b/profiles/gnome.py
index cc80a606..a480d713 100644
--- a/profiles/gnome.py
+++ b/profiles/gnome.py
@@ -4,6 +4,9 @@ import archinstall
 
 is_top_level_profile = False
 
+# Note: GDM should be part of the gnome group, but adding it here for clarity
+__packages__ = ["gnome". "gnome-tweaks", "gdm"]
+
 def _prep_function(*args, **kwargs):
 	"""
 	Magic function called by the importing installer
diff --git a/profiles/kde.py b/profiles/kde.py
index 6654dfa7..28460cbc 100644
--- a/profiles/kde.py
+++ b/profiles/kde.py
@@ -4,6 +4,8 @@ import archinstall, os
 
 is_top_level_profile = False
 
+__packages__ = ["plasma-meta", "konsole", "kate", "dolphin", "sddm", "plasma-wayland-session"]
+
 # TODO: Remove hard dependency of bash (due to .bash_profile)
 
 def _prep_function(*args, **kwargs):
diff --git a/profiles/lxqt.py b/profiles/lxqt.py
index e1ac8ab7..d0727a90 100644
--- a/profiles/lxqt.py
+++ b/profiles/lxqt.py
@@ -5,6 +5,8 @@ import archinstall
 
 is_top_level_profile = False
 
+__packages__ = ["lxqt", "breeze-icons", "oxygen-icons", "xdg-utils", "ttf-freefont", "leafpad", "slock", "sddm"]
+
 def _prep_function(*args, **kwargs):
 	"""
 	Magic function called by the importing installer
diff --git a/profiles/mate.py b/profiles/mate.py
index 3b48d0ab..2cfe7305 100644
--- a/profiles/mate.py
+++ b/profiles/mate.py
@@ -4,6 +4,8 @@ import archinstall
 
 is_top_level_profile = False
 
+__packages__ = ["mate", "mate-extra", "lightdm", "lightdm-gtk-greeter"]
+
 def _prep_function(*args, **kwargs):
 	"""
 	Magic function called by the importing installer
diff --git a/profiles/sway.py b/profiles/sway.py
index 84ea049b..db94ae2c 100644
--- a/profiles/sway.py
+++ b/profiles/sway.py
@@ -4,6 +4,8 @@ import archinstall
 
 is_top_level_profile = False
 
+__packages__ = ["sway", "swaylock", "swayidle", "waybar", "dmenu", "light", "grim", "slurp", "pavucontrol", "alacritty"]
+
 def _prep_function(*args, **kwargs):
 	"""
 	Magic function called by the importing installer
diff --git a/profiles/xfce4.py b/profiles/xfce4.py
index ffe4a3c0..8102919b 100644
--- a/profiles/xfce4.py
+++ b/profiles/xfce4.py
@@ -5,6 +5,8 @@ import archinstall
 
 is_top_level_profile = False
 
+__packages__ = ["xfce4", "xfce4-goodies", "lightdm", "lightdm-gtk-greeter"]
+
 def _prep_function(*args, **kwargs):
 	"""
 	Magic function called by the importing installer
-- 
cgit v1.2.3-70-g09d2


From fd042053be741edaac8d967899d4b9cb1c4a913b Mon Sep 17 00:00:00 2001
From: Dylan Taylor <dylan@dylanmtaylor.com>
Date: Wed, 28 Apr 2021 11:21:24 -0400
Subject: Rework KDE profile package installation

---
 profiles/applications/kde.py | 2 +-
 profiles/kde.py              | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py
index 150fc0e3..a3332130 100644
--- a/profiles/applications/kde.py
+++ b/profiles/applications/kde.py
@@ -1,6 +1,6 @@
 import archinstall
 
-packages = "plasma-meta konsole kate dolphin sddm plasma-wayland-session"
+packages = "" # Other packages for KDE are installed in the main profile now.
 
 if "nvidia" in _gfx_driver_packages:
 	packages = packages + " egl-wayland"
diff --git a/profiles/kde.py b/profiles/kde.py
index 28460cbc..1c98237b 100644
--- a/profiles/kde.py
+++ b/profiles/kde.py
@@ -39,7 +39,10 @@ if __name__ == 'kde':
 	# Install dependency profiles
 	installation.install_profile('xorg')
 
-	# Install the application kde from the template under /applications/
+	# Install the KDE packages
+	installation.add_additional_packages(__packages__)
+
+	# Run KDE application configuration
 	kde = archinstall.Application(installation, 'kde')
 	kde.install()
 
-- 
cgit v1.2.3-70-g09d2


From f9f359ab73dabb74543909af5e98adb6c56a189d Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Wed, 28 Apr 2021 11:30:30 -0400
Subject: This variable wasn't really needed.

---
 profiles/applications/kde.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py
index a3332130..eacba708 100644
--- a/profiles/applications/kde.py
+++ b/profiles/applications/kde.py
@@ -1,8 +1,6 @@
 import archinstall
 
-packages = "" # Other packages for KDE are installed in the main profile now.
+# Other packages for KDE are installed in the main profile now.
 
 if "nvidia" in _gfx_driver_packages:
-	packages = packages + " egl-wayland"
-
-installation.add_additional_packages(packages)
+	installation.add_additional_packages("egl-wayland")
-- 
cgit v1.2.3-70-g09d2


From 1238199ed8022fbfaedcf746527b5d8c1ad975b9 Mon Sep 17 00:00:00 2001
From: Dylan Taylor <dylan@dylanmtaylor.com>
Date: Wed, 28 Apr 2021 11:44:12 -0400
Subject: egl-wayland is small enough that conditionally installing it doesn't
 make a lot of sense

---
 profiles/applications/kde.py | 6 ------
 profiles/kde.py              | 6 +-----
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 profiles/applications/kde.py

diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py
deleted file mode 100644
index eacba708..00000000
--- a/profiles/applications/kde.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import archinstall
-
-# Other packages for KDE are installed in the main profile now.
-
-if "nvidia" in _gfx_driver_packages:
-	installation.add_additional_packages("egl-wayland")
diff --git a/profiles/kde.py b/profiles/kde.py
index 1c98237b..c8efdcde 100644
--- a/profiles/kde.py
+++ b/profiles/kde.py
@@ -4,7 +4,7 @@ import archinstall, os
 
 is_top_level_profile = False
 
-__packages__ = ["plasma-meta", "konsole", "kate", "dolphin", "sddm", "plasma-wayland-session"]
+__packages__ = ["plasma-meta", "konsole", "kate", "dolphin", "sddm", "plasma-wayland-session", "egl-wayland"]
 
 # TODO: Remove hard dependency of bash (due to .bash_profile)
 
@@ -42,9 +42,5 @@ if __name__ == 'kde':
 	# Install the KDE packages
 	installation.add_additional_packages(__packages__)
 
-	# Run KDE application configuration
-	kde = archinstall.Application(installation, 'kde')
-	kde.install()
-
 	# Enable autostart of KDE for all users
 	installation.enable_service('sddm')
-- 
cgit v1.2.3-70-g09d2