Merge branch 'master' of https://github.com/archlinux/archinstall into torxed-partitioning

21 files changed, 91 insertions, 38 deletions

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/awesome.py b/profiles/applications/awesome.py
index 793ee52b..a63c707b 100644
--- a/profiles/applications/awesome.py
+++ b/profiles/applications/awesome.py
@@ -1,10 +1,10 @@
 import archinstall
 
+__packages__ = ["awesome", "xorg-xrandr", "xterm", "feh", "slock", "terminus-font", "gnu-free-fonts", "ttf-liberation", "xsel"]
+
 installation.install_profile('xorg')
 
-installation.add_additional_packages(
-	"awesome xorg-xrandr xterm feh slock terminus-font gnu-free-fonts ttf-liberation xsel"
-)
+installation.add_additional_packages(__packages__)
 
 with open(f'{installation.target}/etc/X11/xinit/xinitrc', 'r') as xinitrc:
 	xinitrc_data = xinitrc.read()
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 de29aa09..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") 
\ No newline at end of file
diff --git a/profiles/applications/cockpit.py b/profiles/applications/cockpit.py
new file mode 100644
index 00000000..f1cea1d2
--- /dev/null
+++ b/profiles/applications/cockpit.py
@@ -0,0 +1,9 @@
+import archinstall
+
+# Define the package list in order for lib to source
+# which packages will be installed by this profile
+__packages__ = ["cockpit", "udisks2", "packagekit"]
+
+installation.add_additional_packages(__packages__)
+
+installation.enable_service('cockpit.socket')
diff --git a/profiles/applications/docker.py b/profiles/applications/docker.py
new file mode 100644
index 00000000..afa3f8fb
--- /dev/null
+++ b/profiles/applications/docker.py
@@ -0,0 +1,9 @@
+import archinstall
+
+# Define the package list in order for lib to source
+# which packages will be installed by this profile
+__packages__ = ["docker"]
+
+installation.add_additional_packages(__packages__)
+
+installation.enable_service('docker')
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/httpd.py b/profiles/applications/httpd.py
new file mode 100644
index 00000000..00d64b6e
--- /dev/null
+++ b/profiles/applications/httpd.py
@@ -0,0 +1,9 @@
+import archinstall
+
+# Define the package list in order for lib to source
+# which packages will be installed by this profile
+__packages__ = ["apache"]
+
+installation.add_additional_packages(__packages__)
+
+installation.enable_service('httpd')
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/lighttpd.py b/profiles/applications/lighttpd.py
new file mode 100644
index 00000000..a1e6a371
--- /dev/null
+++ b/profiles/applications/lighttpd.py
@@ -0,0 +1,9 @@
+import archinstall
+
+# Define the package list in order for lib to source
+# which packages will be installed by this profile
+__packages__ = ["lighttpd"]
+
+installation.add_additional_packages(__packages__)
+
+installation.enable_service('lighttpd')
diff --git a/profiles/applications/lxqt.py b/profiles/applications/lxqt.py
deleted file mode 100644
index 5ce875cc..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 archlinux-wallpaper sddm")
diff --git a/profiles/applications/mariadb.py b/profiles/applications/mariadb.py
new file mode 100644
index 00000000..e458a45a
--- /dev/null
+++ b/profiles/applications/mariadb.py
@@ -0,0 +1,11 @@
+import archinstall
+
+# Define the package list in order for lib to source
+# which packages will be installed by this profile
+__packages__ = ["mariadb"]
+
+installation.add_additional_packages(__packages__)
+
+installation.arch_chroot("mariadb-install-db --user=mysql --basedir=/usr --datadir=/var/lib/mysql")
+
+installation.enable_service('mariadb')
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/nginx.py b/profiles/applications/nginx.py
new file mode 100644
index 00000000..50eb0506
--- /dev/null
+++ b/profiles/applications/nginx.py
@@ -0,0 +1,9 @@
+import archinstall
+
+# Define the package list in order for lib to source
+# which packages will be installed by this profile
+__packages__ = ["nginx"]
+
+installation.add_additional_packages(__packages__)
+
+installation.enable_service('nginx')
diff --git a/profiles/applications/postgresql.py b/profiles/applications/postgresql.py
new file mode 100644
index 00000000..fcdce824
--- /dev/null
+++ b/profiles/applications/postgresql.py
@@ -0,0 +1,11 @@
+import archinstall
+
+# Define the package list in order for lib to source
+# which packages will be installed by this profile
+__packages__ = ["postgresql"]
+
+installation.add_additional_packages(__packages__)
+
+installation.arch_chroot("initdb -D /var/lib/postgres/data", runas='postgres')
+
+installation.enable_service('postgresql')
\ No newline at end of file
diff --git a/profiles/applications/sshd.py b/profiles/applications/sshd.py
new file mode 100644
index 00000000..234638d5
--- /dev/null
+++ b/profiles/applications/sshd.py
@@ -0,0 +1,9 @@
+import archinstall
+
+# Define the package list in order for lib to source
+# which packages will be installed by this profile
+__packages__ = ["openssh"]
+
+installation.add_additional_packages(__packages__)
+
+installation.enable_service('sshd')
diff --git a/profiles/applications/sway.py b/profiles/applications/sway.py
deleted file mode 100644
index 56d7f318..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/tomcat.py b/profiles/applications/tomcat.py
new file mode 100644
index 00000000..9c521390
--- /dev/null
+++ b/profiles/applications/tomcat.py
@@ -0,0 +1,12 @@
+import archinstall
+
+# This is using Tomcat 10 as that is the latest release at the time of implementation.
+# This should probably be updated to use newer releases as they come out.
+
+# Define the package list in order for lib to source
+# which packages will be installed by this profile
+__packages__ = ["tomcat10"]
+
+installation.add_additional_packages(__packages__)
+
+installation.enable_service('tomcat10')
diff --git a/profiles/applications/xfce4.py b/profiles/applications/xfce4.py
deleted file mode 100644
index e8f659c2..00000000
--- a/profiles/applications/xfce4.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import archinstall
-
-installation.add_additional_packages("xfce4 xfce4-goodies lightdm lightdm-gtk-greeter") 
\ No newline at end of file