From 81aa1df82a80c1f7bf0b71c50b2a571d12280730 Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Mon, 5 Apr 2021 13:40:40 -0400
Subject: Fix #183 gnome-extras installs far too much bloat

This keeps some of the most useful packages from the defaults.
---
 profiles/applications/gnome.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'profiles/applications')

diff --git a/profiles/applications/gnome.py b/profiles/applications/gnome.py
index 1f2a20a1..132b4591 100644
--- a/profiles/applications/gnome.py
+++ b/profiles/applications/gnome.py
@@ -1,4 +1,4 @@
 import archinstall
 
-installation.add_additional_packages("gnome gnome-extra gdm") # We'll create a gnome-minimal later, but for now, we'll avoid issues by giving more than we need.
-# Note: gdm should be part of the gnome group, but adding it here for clarity
\ No newline at end of file
+installation.add_additional_packages("gnome gnome-tweaks gnome-todo evolution gdm") # We'll create a gnome-minimal later, but for now, we'll avoid issues by giving more than we need.
+# Note: gdm should be part of the gnome group, but adding it here for clarity
-- 
cgit v1.2.3-54-g00ecf


From 9c82bde2fcd9b442828f8b75740368b72d22c0e0 Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Mon, 5 Apr 2021 13:42:03 -0400
Subject: gnome-sound-recorder is probably also desirable

---
 profiles/applications/gnome.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'profiles/applications')

diff --git a/profiles/applications/gnome.py b/profiles/applications/gnome.py
index 132b4591..06d5feca 100644
--- a/profiles/applications/gnome.py
+++ b/profiles/applications/gnome.py
@@ -1,4 +1,4 @@
 import archinstall
 
-installation.add_additional_packages("gnome gnome-tweaks gnome-todo evolution gdm") # We'll create a gnome-minimal later, but for now, we'll avoid issues by giving more than we need.
+installation.add_additional_packages("gnome gnome-tweaks gnome-todo gnome-sound-recorder evolution gdm") # We'll create a gnome-minimal later, but for now, we'll avoid issues by giving more than we need.
 # Note: gdm should be part of the gnome group, but adding it here for clarity
-- 
cgit v1.2.3-54-g00ecf


From a3ace5e36e01cb84761d967a32dea49c97af4406 Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Mon, 5 Apr 2021 13:44:16 -0400
Subject: This comment should no longer apply. This is a fairly sane default
 for GNOME.

---
 profiles/applications/gnome.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'profiles/applications')

diff --git a/profiles/applications/gnome.py b/profiles/applications/gnome.py
index 06d5feca..e9fd1d50 100644
--- a/profiles/applications/gnome.py
+++ b/profiles/applications/gnome.py
@@ -1,4 +1,4 @@
 import archinstall
 
-installation.add_additional_packages("gnome gnome-tweaks gnome-todo gnome-sound-recorder evolution gdm") # We'll create a gnome-minimal later, but for now, we'll avoid issues by giving more than we need.
+installation.add_additional_packages("gnome gnome-tweaks gnome-todo gnome-sound-recorder evolution gdm")
 # Note: gdm should be part of the gnome group, but adding it here for clarity
-- 
cgit v1.2.3-54-g00ecf


From 8bc1f0d4205403cc6e2fed0a46648ab9531ab5e4 Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Tue, 6 Apr 2021 11:33:50 -0400
Subject: Remove evolution from default installation as suggested

It was pointed out that users can install an email client if they want one.
---
 profiles/applications/gnome.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'profiles/applications')

diff --git a/profiles/applications/gnome.py b/profiles/applications/gnome.py
index e9fd1d50..66656134 100644
--- a/profiles/applications/gnome.py
+++ b/profiles/applications/gnome.py
@@ -1,4 +1,4 @@
 import archinstall
 
-installation.add_additional_packages("gnome gnome-tweaks gnome-todo gnome-sound-recorder evolution gdm")
+installation.add_additional_packages("gnome gnome-tweaks gnome-todo gnome-sound-recorder gdm")
 # Note: gdm should be part of the gnome group, but adding it here for clarity
-- 
cgit v1.2.3-54-g00ecf


From e4ca6d83283697cfeae1da37d8eb22089e3e2664 Mon Sep 17 00:00:00 2001
From: Jatin <40650341+jatin-cbs@users.noreply.github.com>
Date: Wed, 7 Apr 2021 19:18:34 +0530
Subject: Remove gnome-todo and gnome-sound-recorder from default installation

gnome todo and gnome sound recorder should not be in default installation, honoring the Arch Linux philosophy. These packages are not even pre installed on other major linux distributions.
---
 profiles/applications/gnome.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'profiles/applications')

diff --git a/profiles/applications/gnome.py b/profiles/applications/gnome.py
index 66656134..e26290dc 100644
--- a/profiles/applications/gnome.py
+++ b/profiles/applications/gnome.py
@@ -1,4 +1,4 @@
 import archinstall
 
-installation.add_additional_packages("gnome gnome-tweaks gnome-todo gnome-sound-recorder gdm")
+installation.add_additional_packages("gnome gnome-tweaks gdm")
 # Note: gdm should be part of the gnome group, but adding it here for clarity
-- 
cgit v1.2.3-54-g00ecf


From 926906d94613ef67aca10754f4e7eb93c8eaf100 Mon Sep 17 00:00:00 2001
From: advaithm <advaith.madhukar@gmail.com>
Date: Tue, 6 Apr 2021 08:34:34 +0530
Subject: merge kde and kde-wayland

---
 profiles/applications/kde-wayland.py |  7 -------
 profiles/kde-wayland.py              | 34 ----------------------------------
 profiles/kde.py                      | 13 ++++++++++++-
 3 files changed, 12 insertions(+), 42 deletions(-)
 delete mode 100644 profiles/applications/kde-wayland.py
 delete mode 100644 profiles/kde-wayland.py

(limited to 'profiles/applications')

diff --git a/profiles/applications/kde-wayland.py b/profiles/applications/kde-wayland.py
deleted file mode 100644
index 6a9be294..00000000
--- a/profiles/applications/kde-wayland.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import archinstall
-packages = "plasma-meta kde-applications-meta plasma-wayland-session sddm"
-# if the package selection can be reduced go for it
-if "nvidia" in _gfx_driver_packages:
-	packages = packages + " egl-wayland"
-installation.add_additional_packages(packages)
-# We'll support plasma-desktop-wayland (minimal) later
diff --git a/profiles/kde-wayland.py b/profiles/kde-wayland.py
deleted file mode 100644
index e21f62c8..00000000
--- a/profiles/kde-wayland.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# A desktop environment using "KDE".
-import archinstall, os
-
-# TODO: Remove hard dependency of bash (due to .bash_profile)
-
-def _prep_function(*args, **kwargs):
-	"""
-	Magic function called by the importing installer
-	before continuing any further. It also avoids executing any
-	other code in this stage. So it's a safe way to ask the user
-	for more input before any other installer steps start.
-	"""
-
-	# KDE requires a functioning Xorg installation.
-	profile = archinstall.Profile(None, 'xorg')
-	with profile.load_instructions(namespace='xorg.py') as imported:
-		if hasattr(imported, '_prep_function'):
-			return imported._prep_function()
-		else:
-			print('Deprecated (??): xorg profile has no _prep_function() anymore')
-
-# Ensures that this code only gets executed if executed
-# through importlib.util.spec_from_file_location("kde", "/somewhere/kde.py")
-# or through conventional import kde
-if __name__ == 'kde-wayland':
-	# Install dependency profiles
-	installation.install_profile('xorg')
-
-	# Install the application kde from the template under /applications/
-	kde = archinstall.Application(installation, 'kde-wayland')
-	kde.install()
-	print("when you login,  select Plasma (Wayland) for the wayland session")
-	# Enable autostart of KDE for all users
-	installation.enable_service('sddm')
diff --git a/profiles/kde.py b/profiles/kde.py
index 32819bd5..5fb1ca4c 100644
--- a/profiles/kde.py
+++ b/profiles/kde.py
@@ -1,6 +1,6 @@
 # A desktop environment using "KDE".
 
-import archinstall, os
+import archinstall, os 
 
 # TODO: Remove hard dependency of bash (due to .bash_profile)
 
@@ -20,6 +20,17 @@ def _prep_function(*args, **kwargs):
 		else:
 			print('Deprecated (??): xorg profile has no _prep_function() anymore')
 
+def _post_install(*args, **kwargs):
+	if "nvidia" in _gfx_driver_packages:
+		print("Plasma wayland is currently in a buggy state on Nvidia cards")
+	choice = input("Kde plasma has a wayland support would you like to install the required binaries [Y/n] ").lower()
+	if choice == "y":
+		packages = "plasma-meta kde-applications-meta plasma-wayland-session sddm"
+		# if the package selection can be reduced go for it
+		if "nvidia" in _gfx_driver_packages:
+			packages = packages + " egl-wayland"
+		installation.add_additional_packages(packages)
+
 # Ensures that this code only gets executed if executed
 # through importlib.util.spec_from_file_location("kde", "/somewhere/kde.py")
 # or through conventional import kde
-- 
cgit v1.2.3-54-g00ecf


From 130f5729a0939281e8bd2ccc22bfd6c1d3b35c43 Mon Sep 17 00:00:00 2001
From: advaithm <advaith.madhukar@gmail.com>
Date: Tue, 6 Apr 2021 18:28:18 +0530
Subject: ask user for default session over asking if they want wayland

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

(limited to 'profiles/applications')

diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py
index 87a266b0..c0972d50 100644
--- a/profiles/applications/kde.py
+++ b/profiles/applications/kde.py
@@ -1,2 +1,2 @@
 import archinstall
-installation.add_additional_packages("plasma-meta kde-applications-meta sddm") # We'll support plasma-desktop (minimal) later iirc sddm should be part of plasma-meta
+installation.add_additional_packages("plasma-meta kde-applications-meta plasma-wayland-session sddm") # We'll support plasma-desktop (minimal) later iirc sddm should be part of plasma-meta
diff --git a/profiles/kde.py b/profiles/kde.py
index d1174923..89ff236f 100644
--- a/profiles/kde.py
+++ b/profiles/kde.py
@@ -1,6 +1,6 @@
 # A desktop environment using "KDE".
 
-import archinstall, os 
+import archinstall, os, shutil
 
 # TODO: Remove hard dependency of bash (due to .bash_profile)
 
@@ -22,15 +22,11 @@ def _prep_function(*args, **kwargs):
 
 def _post_install(*args, **kwargs):
 	if "nvidia" in _gfx_driver_packages:
-		print("Plasma wayland is currently in a buggy state on Nvidia cards")
-	choice = input("Kde plasma has a wayland support would you like to install the required binaries [Y/n] ").lower()
+		print("Plasma wayland is currently in an unusable state on Nvidia cards")
+	choice = input("Would you like plasma-wayland to be the default session [Y/n] ").lower()
 	if choice == "y":
-		packages = "plasma-wayland-session"
-		# if the package selection can be reduced go for it
-		if "nvidia" in _gfx_driver_packages:
-			packages = packages + " egl-wayland"
-		installation.add_additional_packages(packages)
-
+		shutil.move("/usr/share/xsessions/plasma.desktop","/usr/share/xsessions/plasmax11.desktop")
+		shutil.move("/usr/share/wayland-sessions/plasmawayland.desktop","/usr/share/wayland-sessions/plasma.desktop")
 # Ensures that this code only gets executed if executed
 # through importlib.util.spec_from_file_location("kde", "/somewhere/kde.py")
 # or through conventional import kde
-- 
cgit v1.2.3-54-g00ecf


From 56df79d647b8058bd7160238a418ef8606aef0b7 Mon Sep 17 00:00:00 2001
From: advaithm <advaith.madhukar@gmail.com>
Date: Tue, 6 Apr 2021 18:59:05 +0530
Subject: added egl-wayland and changed prompt

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

(limited to 'profiles/applications')

diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py
index c0972d50..fc42223b 100644
--- a/profiles/applications/kde.py
+++ b/profiles/applications/kde.py
@@ -1,2 +1,5 @@
 import archinstall
-installation.add_additional_packages("plasma-meta kde-applications-meta plasma-wayland-session sddm") # We'll support plasma-desktop (minimal) later iirc sddm should be part of plasma-meta
+packages = "plasma-meta kde-applications-meta sddm plasma-wayland-session"
+if "nvidia" in _gfx_driver_packages:
+	packages = packages + " egl-wayland"
+installation.add_additional_packages(packages)
\ No newline at end of file
diff --git a/profiles/kde.py b/profiles/kde.py
index 89ff236f..7276f095 100644
--- a/profiles/kde.py
+++ b/profiles/kde.py
@@ -1,6 +1,6 @@
 # A desktop environment using "KDE".
 
-import archinstall, os, shutil
+import archinstall, os
 
 # TODO: Remove hard dependency of bash (due to .bash_profile)
 
@@ -22,11 +22,11 @@ def _prep_function(*args, **kwargs):
 
 def _post_install(*args, **kwargs):
 	if "nvidia" in _gfx_driver_packages:
-		print("Plasma wayland is currently in an unusable state on Nvidia cards")
+		print("Plasma Wayland has known compatibility issues with the proprietary Nvidia driver")
 	choice = input("Would you like plasma-wayland to be the default session [Y/n] ").lower()
 	if choice == "y":
-		shutil.move("/usr/share/xsessions/plasma.desktop","/usr/share/xsessions/plasmax11.desktop")
-		shutil.move("/usr/share/wayland-sessions/plasmawayland.desktop","/usr/share/wayland-sessions/plasma.desktop")
+		installation.arch_chroot("mv /usr/share/xsessions/plasma.desktop /usr/share/xsessions/plasmax11.desktop")
+		installation.arch_chroot("mv /usr/share/wayland-sessions/plasmawayland.desktop /usr/share/wayland-sessions/plasma.desktop")
 # Ensures that this code only gets executed if executed
 # through importlib.util.spec_from_file_location("kde", "/somewhere/kde.py")
 # or through conventional import kde
-- 
cgit v1.2.3-54-g00ecf


From 858585e7d7f21b918bbf636bb98fc89e133c8050 Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Tue, 6 Apr 2021 12:33:13 -0400
Subject: Switch from metapackage to a more minimal install

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

(limited to 'profiles/applications')

diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py
index fc42223b..77343d9a 100644
--- a/profiles/applications/kde.py
+++ b/profiles/applications/kde.py
@@ -1,5 +1,5 @@
 import archinstall
-packages = "plasma-meta kde-applications-meta sddm plasma-wayland-session"
+packages = "plasma-meta konsole kate dolphin khelpcenter sddm plasma-wayland-session"
 if "nvidia" in _gfx_driver_packages:
 	packages = packages + " egl-wayland"
-installation.add_additional_packages(packages)
\ No newline at end of file
+installation.add_additional_packages(packages)
-- 
cgit v1.2.3-54-g00ecf


From c07d63296b004b1256e244468cf0478b1998821e Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Tue, 6 Apr 2021 13:45:08 -0400
Subject: It was pointed out that khelpcenter isn't strictly necessary

---
 profiles/applications/kde.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'profiles/applications')

diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py
index 77343d9a..af1e6597 100644
--- a/profiles/applications/kde.py
+++ b/profiles/applications/kde.py
@@ -1,5 +1,5 @@
 import archinstall
-packages = "plasma-meta konsole kate dolphin khelpcenter sddm plasma-wayland-session"
+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-54-g00ecf


From 8c9b16204964977c60944a324b80c58ed56119b7 Mon Sep 17 00:00:00 2001
From: Dylan Taylor <dylan@dylanmtaylor.com>
Date: Thu, 8 Apr 2021 15:14:16 -0400
Subject: Implement Sway Try switching from gdm to sddm as gdm pulls in a lot
 of GNOME packages

Fix comment
Update sway.py
---
 profiles/applications/sway.py |  3 +++
 profiles/sway.py              | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 profiles/applications/sway.py
 create mode 100644 profiles/sway.py

(limited to 'profiles/applications')

diff --git a/profiles/applications/sway.py b/profiles/applications/sway.py
new file mode 100644
index 00000000..5f66233c
--- /dev/null
+++ b/profiles/applications/sway.py
@@ -0,0 +1,3 @@
+import archinstall
+
+installation.add_additional_packages("sway sddm")
diff --git a/profiles/sway.py b/profiles/sway.py
new file mode 100644
index 00000000..fd8407df
--- /dev/null
+++ b/profiles/sway.py
@@ -0,0 +1,24 @@
+# A desktop environment using "Sway"
+
+import archinstall
+
+is_top_level_profile = False
+
+def _prep_function(*args, **kwargs):
+	"""
+	Magic function called by the importing installer
+	before continuing any further. It also avoids executing any
+	other code in this stage. So it's a safe way to ask the user
+	for more input before any other installer steps start.
+	"""
+	return True
+
+# Ensures that this code only gets executed if executed
+# 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()
+
+	installation.enable_service('sddm') # SDDM, which supports Sway
-- 
cgit v1.2.3-54-g00ecf


From 0d194e2606809fb88eb25e2a1711fbad8a862d27 Mon Sep 17 00:00:00 2001
From: Dylan Taylor <dylan@dylanmtaylor.com>
Date: Thu, 8 Apr 2021 15:54:54 -0400
Subject: Initial implementation of LXQt

---
 profiles/applications/lxqt.py |  3 +++
 profiles/desktop.py           |  2 +-
 profiles/lxqt.py              | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 profiles/applications/lxqt.py
 create mode 100644 profiles/lxqt.py

(limited to 'profiles/applications')

diff --git a/profiles/applications/lxqt.py b/profiles/applications/lxqt.py
new file mode 100644
index 00000000..f2a75e0e
--- /dev/null
+++ b/profiles/applications/lxqt.py
@@ -0,0 +1,3 @@
+import archinstall
+
+installation.add_additional_packages("lxqt breeze-icons sddm")
diff --git a/profiles/desktop.py b/profiles/desktop.py
index d552a17f..4c6255e7 100644
--- a/profiles/desktop.py
+++ b/profiles/desktop.py
@@ -16,7 +16,7 @@ def _prep_function(*args, **kwargs):
 	for more input before any other installer steps start.
 	"""
 
-	supported_desktops = ['gnome', 'kde', 'awesome', 'sway', 'cinnamon', 'xfce4']
+	supported_desktops = ['gnome', 'kde', 'awesome', 'sway', 'cinnamon', 'xfce4', 'lxqt']
 	desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environment: ')
 	
 	# Temporarily store the selected desktop profile
diff --git a/profiles/lxqt.py b/profiles/lxqt.py
new file mode 100644
index 00000000..871488ee
--- /dev/null
+++ b/profiles/lxqt.py
@@ -0,0 +1,35 @@
+
+# A desktop environment using "LXQt"
+
+import archinstall
+
+is_top_level_profile = False
+
+def _prep_function(*args, **kwargs):
+	"""
+	Magic function called by the importing installer
+	before continuing any further. It also avoids executing any
+	other code in this stage. So it's a safe way to ask the user
+	for more input before any other installer steps start.
+	"""
+
+	# LXQt requires a functional xorg installation.
+	profile = archinstall.Profile(None, 'xorg')
+	with profile.load_instructions(namespace='xorg.py') as imported:
+		if hasattr(imported, '_prep_function'):
+			return imported._prep_function()
+		else:
+			print('Deprecated (??): xorg profile has no _prep_function() anymore')
+
+# Ensures that this code only gets executed if executed
+# through importlib.util.spec_from_file_location("lxqt", "/somewhere/lxqt.py")
+# or through conventional import lxqt
+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()
+
+	installation.enable_service('sddm') # SDDM Display Manager
-- 
cgit v1.2.3-54-g00ecf


From adb73f5ba6cfb3f13b821d16784f2f8d60ee29c0 Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Thu, 8 Apr 2021 16:10:33 -0400
Subject: It was far too minimal to be usable before.

---
 profiles/applications/lxqt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'profiles/applications')

diff --git a/profiles/applications/lxqt.py b/profiles/applications/lxqt.py
index f2a75e0e..42cf80de 100644
--- a/profiles/applications/lxqt.py
+++ b/profiles/applications/lxqt.py
@@ -1,3 +1,3 @@
 import archinstall
 
-installation.add_additional_packages("lxqt breeze-icons sddm")
+installation.add_additional_packages("lxqt breeze-icons xdg-utils ttf-freefont leafpad xscreensaver archlinux-wallpaper sddm")
-- 
cgit v1.2.3-54-g00ecf


From 9545680459528c63e9dececb0804d9b498130ef6 Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Thu, 8 Apr 2021 16:21:46 -0400
Subject: breeze-icons and oxygen-icons are both needed to not have missing
 icons

---
 profiles/applications/lxqt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'profiles/applications')

diff --git a/profiles/applications/lxqt.py b/profiles/applications/lxqt.py
index 42cf80de..87586931 100644
--- a/profiles/applications/lxqt.py
+++ b/profiles/applications/lxqt.py
@@ -1,3 +1,3 @@
 import archinstall
 
-installation.add_additional_packages("lxqt breeze-icons xdg-utils ttf-freefont leafpad xscreensaver archlinux-wallpaper sddm")
+installation.add_additional_packages("lxqt breeze-icons oxygen-icons xdg-utils ttf-freefont leafpad xscreensaver archlinux-wallpaper sddm")
-- 
cgit v1.2.3-54-g00ecf


From 51f533539dfe499f37e957b87c0c78caf307b747 Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Thu, 8 Apr 2021 16:34:17 -0400
Subject: Change xscreensaver to slock

---
 profiles/applications/lxqt.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'profiles/applications')

diff --git a/profiles/applications/lxqt.py b/profiles/applications/lxqt.py
index 87586931..5ce875cc 100644
--- a/profiles/applications/lxqt.py
+++ b/profiles/applications/lxqt.py
@@ -1,3 +1,3 @@
 import archinstall
 
-installation.add_additional_packages("lxqt breeze-icons oxygen-icons xdg-utils ttf-freefont leafpad xscreensaver archlinux-wallpaper sddm")
+installation.add_additional_packages("lxqt breeze-icons oxygen-icons xdg-utils ttf-freefont leafpad slock archlinux-wallpaper sddm")
-- 
cgit v1.2.3-54-g00ecf


From 6b5b3180f31b4591c7359859cf692d538b47db20 Mon Sep 17 00:00:00 2001
From: advaithm <advaith.madhukar@gmail.com>
Date: Mon, 5 Apr 2021 20:46:09 +0530
Subject: add i3-wm and i3-gaps support

---
 profiles/applications/i3-gaps.py |  2 ++
 profiles/applications/i3-wm.py   |  2 ++
 profiles/i3-gaps.py              | 28 ++++++++++++++++++++++++++++
 profiles/i3-wm.py                | 28 ++++++++++++++++++++++++++++
 4 files changed, 60 insertions(+)
 create mode 100644 profiles/applications/i3-gaps.py
 create mode 100644 profiles/applications/i3-wm.py
 create mode 100644 profiles/i3-gaps.py
 create mode 100644 profiles/i3-wm.py

(limited to 'profiles/applications')

diff --git a/profiles/applications/i3-gaps.py b/profiles/applications/i3-gaps.py
new file mode 100644
index 00000000..4dd95989
--- /dev/null
+++ b/profiles/applications/i3-gaps.py
@@ -0,0 +1,2 @@
+import archinstall
+installation.add_additional_packages("i3lock i3status i3blocks i3-gaps")
\ No newline at end of file
diff --git a/profiles/applications/i3-wm.py b/profiles/applications/i3-wm.py
new file mode 100644
index 00000000..8662497d
--- /dev/null
+++ b/profiles/applications/i3-wm.py
@@ -0,0 +1,2 @@
+import archinstall
+installation.add_additional_packages("i3lock i3status i3blocks i3-wm")
\ No newline at end of file
diff --git a/profiles/i3-gaps.py b/profiles/i3-gaps.py
new file mode 100644
index 00000000..bf8227ba
--- /dev/null
+++ b/profiles/i3-gaps.py
@@ -0,0 +1,28 @@
+import archinstall
+
+def _prep_function(*args, **kwargs):
+	"""
+	Magic function called by the importing installer
+	before continuing any further. It also avoids executing any
+	other code in this stage. So it's a safe way to ask the user
+	for more input before any other installer steps start.
+	"""
+
+	# KDE requires a functioning Xorg installation.
+	profile = archinstall.Profile(None, 'xorg')
+	with profile.load_instructions(namespace='xorg.py') as imported:
+		if hasattr(imported, '_prep_function'):
+			return imported._prep_function()
+		else:
+			print('Deprecated (??): xorg profile has no _prep_function() anymore')
+
+if __name__ == 'i3-wm':
+	# 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")
+    # install the i3 group now
+    i3 = archinstall.Application(installation, 'i3-gaps')
+    i3.install()
+    # Auto start lightdm for all users
+    installation.enable_service('lightdm')
diff --git a/profiles/i3-wm.py b/profiles/i3-wm.py
new file mode 100644
index 00000000..168abb72
--- /dev/null
+++ b/profiles/i3-wm.py
@@ -0,0 +1,28 @@
+import archinstall
+
+def _prep_function(*args, **kwargs):
+	"""
+	Magic function called by the importing installer
+	before continuing any further. It also avoids executing any
+	other code in this stage. So it's a safe way to ask the user
+	for more input before any other installer steps start.
+	"""
+
+	# KDE requires a functioning Xorg installation.
+	profile = archinstall.Profile(None, 'xorg')
+	with profile.load_instructions(namespace='xorg.py') as imported:
+		if hasattr(imported, '_prep_function'):
+			return imported._prep_function()
+		else:
+			print('Deprecated (??): xorg profile has no _prep_function() anymore')
+
+if __name__ == 'i3-wm':
+    # Install dependency profiles
+    installation.install_profile('xorg')
+    # we are installing lightdm to auto start i3
+    installation.add_additional_packages("lightdm-gtk-greeter lightdm")
+    # install the i3 group now
+    i3 = archinstall.Application(installation, 'i3-wm')
+    i3.install()
+    # Auto start lightdm for all users
+    installation.enable_service('lightdm')
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf


From a5eb815b3e9447062aff613ff0100e2c62db851d Mon Sep 17 00:00:00 2001
From: Dylan Taylor <dylan@dylanmtaylor.com>
Date: Thu, 8 Apr 2021 21:00:55 -0400
Subject: Move common packages to common i3 profile

---
 profiles/applications/i3-gaps.py | 2 +-
 profiles/applications/i3-wm.py   | 2 +-
 profiles/i3.py                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'profiles/applications')

diff --git a/profiles/applications/i3-gaps.py b/profiles/applications/i3-gaps.py
index 4dd95989..4daed7ad 100644
--- a/profiles/applications/i3-gaps.py
+++ b/profiles/applications/i3-gaps.py
@@ -1,2 +1,2 @@
 import archinstall
-installation.add_additional_packages("i3lock i3status i3blocks i3-gaps")
\ No newline at end of file
+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
index 8662497d..e7838a64 100644
--- a/profiles/applications/i3-wm.py
+++ b/profiles/applications/i3-wm.py
@@ -1,2 +1,2 @@
 import archinstall
-installation.add_additional_packages("i3lock i3status i3blocks i3-wm")
\ No newline at end of file
+installation.add_additional_packages("i3-wm")
\ No newline at end of file
diff --git a/profiles/i3.py b/profiles/i3.py
index 3867dfb5..b9d7495e 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__ = []
+__packages__ = ['i3lock', 'i3status', 'i3blocks']
 
 def _prep_function(*args, **kwargs):
 	"""
-- 
cgit v1.2.3-54-g00ecf


From d50b26498e46327d71e57d133c323a4f58ba1180 Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Fri, 9 Apr 2021 06:48:23 -0400
Subject: Add the sway packages from advaithm's 2.2.0 sway work Remove sddm

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

(limited to 'profiles/applications')

diff --git a/profiles/applications/sway.py b/profiles/applications/sway.py
index 5f66233c..c99f378a 100644
--- a/profiles/applications/sway.py
+++ b/profiles/applications/sway.py
@@ -1,3 +1,3 @@
 import archinstall
-
-installation.add_additional_packages("sway sddm")
+packages = "sway swaylock swayidle dmenu alacritty"
+installation.add_additional_packages(packages)
-- 
cgit v1.2.3-54-g00ecf


From 5499bcc8b9a2f43c096cf9f25a27e0db9b69393e Mon Sep 17 00:00:00 2001
From: m1ten <57693631+m1ten@users.noreply.github.com>
Date: Sun, 4 Apr 2021 13:38:10 -0400
Subject: applications/cinnamon

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

(limited to 'profiles/applications')

diff --git a/profiles/applications/cinnamon.py b/profiles/applications/cinnamon.py
new file mode 100644
index 00000000..af1cbee2
--- /dev/null
+++ b/profiles/applications/cinnamon.py
@@ -0,0 +1,4 @@
+import archinstall
+
+installation.add_additional_packages("cinnamon system-config-printer gnome-keyring gnome-terminal blueberry metacity lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings") 
+# We'll create a cinnamon-minimal later, but for now, we'll avoid issues by giving more than we need.
-- 
cgit v1.2.3-54-g00ecf


From 738e60c05960a90aa7ab83165f9993ca6ba556f6 Mon Sep 17 00:00:00 2001
From: m1ten <57693631+m1ten@users.noreply.github.com>
Date: Sat, 3 Apr 2021 16:19:23 -0400
Subject: applications/xfce4

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

(limited to 'profiles/applications')

diff --git a/profiles/applications/xfce4.py b/profiles/applications/xfce4.py
new file mode 100644
index 00000000..74bf5990
--- /dev/null
+++ b/profiles/applications/xfce4.py
@@ -0,0 +1,3 @@
+import archinstall
+
+installation.add_additional_packages("xfce4 xfce4-goodies lightdm") # We'll create a xfce4-minimal later, but for now, we'll avoid issues by giving more than we need.
-- 
cgit v1.2.3-54-g00ecf


From b86233d7bae14366621b090cfddfb467bd5fa135 Mon Sep 17 00:00:00 2001
From: m1ten <57693631+m1ten@users.noreply.github.com>
Date: Sun, 4 Apr 2021 13:49:37 -0400
Subject: add lightdm-gtk-greeter

---
 profiles/applications/xfce4.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'profiles/applications')

diff --git a/profiles/applications/xfce4.py b/profiles/applications/xfce4.py
index 74bf5990..6d6f8f7c 100644
--- a/profiles/applications/xfce4.py
+++ b/profiles/applications/xfce4.py
@@ -1,3 +1,4 @@
 import archinstall
 
-installation.add_additional_packages("xfce4 xfce4-goodies lightdm") # We'll create a xfce4-minimal later, but for now, we'll avoid issues by giving more than we need.
+installation.add_additional_packages("xfce4 xfce4-goodies lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings") 
+# We'll create a xfce4-minimal later, but for now, we'll avoid issues by giving more than we need.
-- 
cgit v1.2.3-54-g00ecf


From 326b96d80869bc9c67eec89eb05bea2fac131939 Mon Sep 17 00:00:00 2001
From: Dylan Taylor <dylan@dylanmtaylor.com>
Date: Fri, 9 Apr 2021 08:29:58 -0400
Subject: Add budgie implementation

---
 profiles/applications/budgie.py   |  4 ++++
 profiles/applications/cinnamon.py |  3 +--
 profiles/applications/xfce4.py    |  3 +--
 profiles/budgie.py                | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 profiles/applications/budgie.py
 create mode 100644 profiles/budgie.py

(limited to 'profiles/applications')

diff --git a/profiles/applications/budgie.py b/profiles/applications/budgie.py
new file mode 100644
index 00000000..8c5ea223
--- /dev/null
+++ b/profiles/applications/budgie.py
@@ -0,0 +1,4 @@
+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 lightdm-gtk-greeter-settings gnome")
\ No newline at end of file
diff --git a/profiles/applications/cinnamon.py b/profiles/applications/cinnamon.py
index af1cbee2..5e2ac02e 100644
--- a/profiles/applications/cinnamon.py
+++ b/profiles/applications/cinnamon.py
@@ -1,4 +1,3 @@
 import archinstall
 
-installation.add_additional_packages("cinnamon system-config-printer gnome-keyring gnome-terminal blueberry metacity lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings") 
-# We'll create a cinnamon-minimal later, but for now, we'll avoid issues by giving more than we need.
+installation.add_additional_packages("cinnamon system-config-printer gnome-keyring gnome-terminal blueberry metacity lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings") 
\ No newline at end of file
diff --git a/profiles/applications/xfce4.py b/profiles/applications/xfce4.py
index 6d6f8f7c..809d10d0 100644
--- a/profiles/applications/xfce4.py
+++ b/profiles/applications/xfce4.py
@@ -1,4 +1,3 @@
 import archinstall
 
-installation.add_additional_packages("xfce4 xfce4-goodies lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings") 
-# We'll create a xfce4-minimal later, but for now, we'll avoid issues by giving more than we need.
+installation.add_additional_packages("xfce4 xfce4-goodies lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings") 
\ No newline at end of file
diff --git a/profiles/budgie.py b/profiles/budgie.py
new file mode 100644
index 00000000..6c5475ae
--- /dev/null
+++ b/profiles/budgie.py
@@ -0,0 +1,34 @@
+# A desktop environment using "budgie"
+
+import archinstall
+
+is_top_level_profile = False
+
+def _prep_function(*args, **kwargs):
+	"""
+	Magic function called by the importing installer
+	before continuing any further. It also avoids executing any
+	other code in this stage. So it's a safe way to ask the user
+	for more input before any other installer steps start.
+	"""
+
+	# budgie requires a functioning Xorg installation.
+	profile = archinstall.Profile(None, 'xorg')
+	with profile.load_instructions(namespace='xorg.py') as imported:
+		if hasattr(imported, '_prep_function'):
+			return imported._prep_function()
+		else:
+			print('Deprecated (??): xorg profile has no _prep_function() anymore')
+
+# Ensures that this code only gets executed if executed
+# through importlib.util.spec_from_file_location("budgie", "/somewhere/budgie.py")
+# or through conventional import budgie
+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()
+
+	installation.enable_service('lightdm') # Light Display Manager
-- 
cgit v1.2.3-54-g00ecf


From 8d627d0c099e33332a7db750b2b875f8d1080947 Mon Sep 17 00:00:00 2001
From: "Dylan M. Taylor" <dylan@dylanmtaylor.com>
Date: Fri, 9 Apr 2021 14:19:46 -0400
Subject: Add more suggested packages to sway

---
 profiles/applications/sway.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'profiles/applications')

diff --git a/profiles/applications/sway.py b/profiles/applications/sway.py
index c99f378a..56d7f318 100644
--- a/profiles/applications/sway.py
+++ b/profiles/applications/sway.py
@@ -1,3 +1,3 @@
 import archinstall
-packages = "sway swaylock swayidle dmenu alacritty"
+packages = "sway swaylock swayidle waybar dmenu light grim slurp pavucontrol alacritty"
 installation.add_additional_packages(packages)
-- 
cgit v1.2.3-54-g00ecf


From 29ecf232d40d56811a177375d739e59546d9f38d Mon Sep 17 00:00:00 2001
From: Dylan Taylor <dylan@dylanmtaylor.com>
Date: Sat, 10 Apr 2021 00:21:15 -0400
Subject: Remove lightdm-gtk-greeter-settings

---
 profiles/applications/budgie.py   | 2 +-
 profiles/applications/cinnamon.py | 2 +-
 profiles/applications/xfce4.py    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'profiles/applications')

diff --git a/profiles/applications/budgie.py b/profiles/applications/budgie.py
index 8c5ea223..ccec4e14 100644
--- a/profiles/applications/budgie.py
+++ b/profiles/applications/budgie.py
@@ -1,4 +1,4 @@
 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 lightdm-gtk-greeter-settings gnome")
\ No newline at end of file
+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
index 5e2ac02e..de29aa09 100644
--- a/profiles/applications/cinnamon.py
+++ b/profiles/applications/cinnamon.py
@@ -1,3 +1,3 @@
 import archinstall
 
-installation.add_additional_packages("cinnamon system-config-printer gnome-keyring gnome-terminal blueberry metacity lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings") 
\ No newline at end of file
+installation.add_additional_packages("cinnamon system-config-printer gnome-keyring gnome-terminal blueberry metacity lightdm lightdm-gtk-greeter") 
\ No newline at end of file
diff --git a/profiles/applications/xfce4.py b/profiles/applications/xfce4.py
index 809d10d0..e8f659c2 100644
--- a/profiles/applications/xfce4.py
+++ b/profiles/applications/xfce4.py
@@ -1,3 +1,3 @@
 import archinstall
 
-installation.add_additional_packages("xfce4 xfce4-goodies lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings") 
\ No newline at end of file
+installation.add_additional_packages("xfce4 xfce4-goodies lightdm lightdm-gtk-greeter") 
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf


From cf46642037bf6ed098dc5dfd088b7a2f2e6d5d68 Mon Sep 17 00:00:00 2001
From: Dylan Taylor <dylan@dylanmtaylor.com>
Date: Sun, 11 Apr 2021 09:50:52 -0400
Subject: Implement MATE desktop environment

---
 profiles/applications/mate.py |  3 +++
 profiles/desktop.py           |  2 +-
 profiles/mate.py              | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 profiles/applications/mate.py
 create mode 100644 profiles/mate.py

(limited to 'profiles/applications')

diff --git a/profiles/applications/mate.py b/profiles/applications/mate.py
new file mode 100644
index 00000000..24d6be47
--- /dev/null
+++ b/profiles/applications/mate.py
@@ -0,0 +1,3 @@
+import archinstall
+
+installation.add_additional_packages("mate mate-extra lightdm lightdm-gtk-greeter") 
\ No newline at end of file
diff --git a/profiles/desktop.py b/profiles/desktop.py
index 4d64dcef..846182e2 100644
--- a/profiles/desktop.py
+++ b/profiles/desktop.py
@@ -16,7 +16,7 @@ def _prep_function(*args, **kwargs):
 	for more input before any other installer steps start.
 	"""
 
-	supported_desktops = ['gnome', 'kde', 'awesome', 'sway', 'cinnamon', 'xfce4', 'lxqt', 'i3', 'budgie']
+	supported_desktops = ['gnome', 'kde', 'awesome', 'sway', 'cinnamon', 'xfce4', 'lxqt', 'i3', 'budgie', 'mate']
 	desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environment: ')
 	
 	# Temporarily store the selected desktop profile
diff --git a/profiles/mate.py b/profiles/mate.py
new file mode 100644
index 00000000..b4c697b1
--- /dev/null
+++ b/profiles/mate.py
@@ -0,0 +1,34 @@
+# A desktop environment using "MATE"
+
+import archinstall
+
+is_top_level_profile = False
+
+def _prep_function(*args, **kwargs):
+	"""
+	Magic function called by the importing installer
+	before continuing any further. It also avoids executing any
+	other code in this stage. So it's a safe way to ask the user
+	for more input before any other installer steps start.
+	"""
+
+	# MATE requires a functional xorg installation.
+	profile = archinstall.Profile(None, 'xorg')
+	with profile.load_instructions(namespace='xorg.py') as imported:
+		if hasattr(imported, '_prep_function'):
+			return imported._prep_function()
+		else:
+			print('Deprecated (??): xorg profile has no _prep_function() anymore')
+
+# Ensures that this code only gets executed if executed
+# through importlib.util.spec_from_file_location("mate", "/somewhere/mate.py")
+# or through conventional import mate
+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()
+
+	installation.enable_service('lightdm') # Light Display Manager
-- 
cgit v1.2.3-54-g00ecf