From 4499c0b16fcc1ea93678f02f609d04f4c57c6889 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Mon, 1 Apr 2024 18:19:03 -0700
Subject: [PATCH] Add KDE and Cinnamon spins

Signed-off-by: Louis Abel <label@rockylinux.org>
---
 components/live/cinnamon.xml            | 85 +++++++++++++++++++++++++
 components/live/kde.xml                 | 46 +++++++++++++
 components/live/mate.xml                |  1 +
 components/live/xfce.xml                |  1 +
 configs/rocky-live-cinnamon.xml         | 28 ++++++++
 configs/rocky-live-kde.ks               | 28 ++++++++
 configs/rocky-live-workstation-lite.xml |  1 -
 configs/rocky-live-workstation.xml      |  1 -
 configs/rocky.xml                       |  4 ++
 live/cinnamon.xml                       | 12 ++++
 live/kde.xml                            | 12 ++++
 live/mate.xml                           |  1 +
 live/xfce.xml                           |  1 +
 13 files changed, 219 insertions(+), 2 deletions(-)
 create mode 100644 components/live/cinnamon.xml
 create mode 100644 components/live/kde.xml
 create mode 100644 configs/rocky-live-cinnamon.xml
 create mode 100644 configs/rocky-live-kde.ks
 create mode 100644 live/cinnamon.xml
 create mode 100644 live/kde.xml

diff --git a/components/live/cinnamon.xml b/components/live/cinnamon.xml
new file mode 100644
index 0000000..97a053a
--- /dev/null
+++ b/components/live/cinnamon.xml
@@ -0,0 +1,85 @@
+<image>
+  <profiles>
+    <profile name="Cinnamon-Desktop" description="Cinnamon Desktop">
+      <requires profile="Live-Base"/>
+    </profile>
+  </profiles>
+  <preferences profiles="Live-Base">
+    <type image="iso" publisher="Rocky Enterprise Software Foundation" volid="Rocky-ZZVOLVERZZ-Cinnamon" primary="true" flags="dmsquash" firmware="uefi" kernelcmdline="quiet rhgb" mediacheck="false">
+      <bootloader name="grub2" grub_template="grub.tmpl" console="console" timeout="10"/>
+    </type>
+  </preferences>
+  <packages type="image" patternType="plusRecommended" profiles="Cinnamon-Desktop">
+    <package name="epel-release"/>
+    <package name="libreoffice-calc"/>
+    <package name="libreoffice-emailmerge" arch="x86_64"/>
+    <package name="libreoffice-graphicfilter"/>
+    <package name="libreoffice-impress"/>
+    <package name="libreoffice-writer"/>
+    <package name="NetworkManager-adsl"/>
+    <package name="NetworkManager-bluetooth"/>
+    <package name="NetworkManager-l2tp-gnome"/>
+    <package name="NetworkManager-libreswan-gnome"/>
+    <package name="NetworkManager-openconnect-gnome"/>
+    <package name="NetworkManager-openvpn-gnome"/>
+    <package name="NetworkManager-ppp"/>
+    <package name="NetworkManager-pptp-gnome"/>
+    <package name="NetworkManager-wifi"/>
+    <package name="NetworkManager-wwan"/>
+    <package name="cinnamon"/>
+    <package name="cinnamon-control-center"/>
+    <package name="cinnamon-screensaver"/>
+    <package name="eom"/>
+    <package name="f36-backgrounds-extras-gnome"/>
+    <package name="f36-backgrounds-gnome"/>
+    <package name="f37-backgrounds-extras-gnome"/>
+    <package name="f37-backgrounds-gnome"/>
+    <package name="firefox"/>
+    <package name="firewall-config"/>
+    <package name="gjs"/>
+    <package name="gnome-calculator"/>
+    <package name="gnome-disk-utility"/>
+    <package name="gnome-screenshot"/>
+    <package name="gnome-system-monitor"/>
+    <package name="gnome-terminal"/>
+    <package name="gstreamer1-plugins-ugly-free"/>
+    <package name="gvfs-gphoto2"/>
+    <package name="gvfs-mtp"/>
+    <package name="gvfs-smb"/>
+    <package name="hexchat"/>
+    <package name="imsettings-systemd"/>
+    <package name="initial-setup-gui"/>
+    <package name="lightdm"/>
+    <package name="metacity"/>
+    <package name="nemo-fileroller"/>
+    <package name="nemo-image-converter"/>
+    <package name="nemo-preview"/>
+    <package name="nm-connection-editor"/>
+    <package name="parole"/>
+    <package name="pipewire-alsa"/>
+    <package name="pipewire-pulseaudio"/>
+    <package name="powerline"/>
+    <package name="redshift-gtk"/>
+    <package name="rocky-backgrounds"/>
+    <package name="sane-backends-drivers-scanners"/>
+    <package name="setroubleshoot"/>
+    <package name="slick-greeter"/>
+    <package name="slick-greeter-cinnamon"/>
+    <package name="thunderbird"/>
+    <package name="tmux"/>
+    <package name="tmux-powerline"/>
+    <package name="transmission"/>
+    <package name="vim-enhanced"/>
+    <package name="vim-powerline"/>
+    <package name="wireplumber"/>
+    <package name="xdg-user-dirs-gtk"/>
+    <package name="xed"/>
+    <package name="xreader"/>
+    <!-- ignores for space and other things -->
+    <ignore name="isdn4k-utils"/>
+    <ignore name="hplip"/>
+    <ignore name="mpage"/>
+    <ignore name="xsane"/>
+    <ignore name="xsane-gimp"/>
+  </packages>
+</image>
diff --git a/components/live/kde.xml b/components/live/kde.xml
new file mode 100644
index 0000000..14b1292
--- /dev/null
+++ b/components/live/kde.xml
@@ -0,0 +1,46 @@
+<image>
+  <profiles>
+    <profile name="KDE-Desktop" description="KDE Desktop">
+      <requires profile="Live-Base"/>
+    </profile>
+  </profiles>
+  <preferences profiles="Live-Base">
+    <type image="iso" publisher="Rocky Enterprise Software Foundation" volid="Rocky-ZZVOLVERZZ-KDE" primary="true" flags="dmsquash" firmware="uefi" kernelcmdline="quiet rhgb" mediacheck="false">
+      <bootloader name="grub2" grub_template="grub.tmpl" console="console" timeout="10"/>
+    </type>
+  </preferences>
+  <packages type="image" patternType="plusRecommended" profiles="KDE-Desktop">
+    <package name="epel-release"/>
+    <namedCollection name="fuse"/>
+    <namedCollection name="gjs"/>
+    <namedCollection name="internet-browser"/>
+    <namedCollection name="kde-desktop-environment"/>
+    <namedCollection name="kde-apps"/>
+    <namedCollection name="kde-media"/>
+    <package name="libreoffice-calc"/>
+    <package name="libreoffice-emailmerge" arch="x86_64"/>
+    <package name="libreoffice-graphicfilter"/>
+    <package name="libreoffice-impress"/>
+    <package name="libreoffice-writer"/>
+    <package name="mariadb-embedded"/>
+    <package name="mariadb-connector-c"/>
+    <package name="mariadb-server"/>
+    <package name="rocky-backgrounds-kde"/>
+    <package name="sddm"/>
+    <package name="sddm-breeze"/>
+    <package name="sddm-themes"/>
+    <package name="sddm-kcm"/>
+    <!-- ignores for space and other things -->
+    <ignore name="desktop-backgrounds-basic"/>
+    <ignore name="gnome-disk-utility"/>
+    <ignore name="hplip"/>
+    <ignore name="iok"/>
+    <ignore name="isdn4k-utils"/>
+    <ignore name="kdeaccessibility"/>
+    <ignore name="mpage"/>
+    <ignore name="system-config-printer"/>
+    <ignore name="system-config-services"/>
+    <ignore name="system-config-users"/>
+    <ignore name="xsane"/>
+  </packages>
+</image>
diff --git a/components/live/mate.xml b/components/live/mate.xml
index 3641e57..892fc6c 100644
--- a/components/live/mate.xml
+++ b/components/live/mate.xml
@@ -30,6 +30,7 @@
     <package name="dconf-editor"/>
     <package name="engrampa"/>
     <package name="eom"/>
+    <package name="epel-release"/>
     <package name="f36-backgrounds-extras-mate"/>
     <package name="f36-backgrounds-mate"/>
     <package name="f37-backgrounds-extras-mate"/>
diff --git a/components/live/xfce.xml b/components/live/xfce.xml
index 0f9b1d5..b606da2 100644
--- a/components/live/xfce.xml
+++ b/components/live/xfce.xml
@@ -18,6 +18,7 @@
     <package name="xfconf"/>
     <package name="xfdesktop"/>
     <package name="xfwm4"/>
+    <package name="epel-release"/>
     <package name="firefox"/>
     <package name="firewall-config"/>
     <package name="gjs"/>
diff --git a/configs/rocky-live-cinnamon.xml b/configs/rocky-live-cinnamon.xml
new file mode 100644
index 0000000..d9f8067
--- /dev/null
+++ b/configs/rocky-live-cinnamon.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<image schemaversion="7.4" name="Rocky-ZZVERZZ-Cinnamon" displayname="Rocky Linux Cinnamon ZZVERZZ">
+  <description type="system">
+    <author>Release Engineering (SIG/Core)</author>
+    <contact>releng@rockylinux.org</contact>
+    <specification>Rocky Linux</specification>
+  </description>
+  <preferences>
+    <version>9</version>
+    <packagemanager>dnf</packagemanager>
+    <locale>en_US</locale>
+    <keytable>us</keytable>
+    <timezone>UTC</timezone>
+    <release-version>9</release-version>
+  </preferences>
+  <include from="this://./repositories/core.xml"/>
+  <include from="this://./repositories/epel.xml"/>
+  <include from="this://./components/boot.xml"/>
+  <include from="this://./components/users.xml"/>
+  <include from="this://./components/live/common.xml"/>
+  <include from="this://./components/live/cinnamon.xml"/>
+  <include from="this://./live/cinnamon.xml"/>
+  <packages type="bootstrap">
+    <package name="basesystem"/>
+    <package name="filesystem"/>
+  </packages>
+</image>
diff --git a/configs/rocky-live-kde.ks b/configs/rocky-live-kde.ks
new file mode 100644
index 0000000..9ac1acc
--- /dev/null
+++ b/configs/rocky-live-kde.ks
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<image schemaversion="7.4" name="Rocky-ZZVERZZ-KDE" displayname="Rocky Linux KDE ZZVERZZ">
+  <description type="system">
+    <author>Release Engineering (SIG/Core)</author>
+    <contact>releng@rockylinux.org</contact>
+    <specification>Rocky Linux</specification>
+  </description>
+  <preferences>
+    <version>9</version>
+    <packagemanager>dnf</packagemanager>
+    <locale>en_US</locale>
+    <keytable>us</keytable>
+    <timezone>UTC</timezone>
+    <release-version>9</release-version>
+  </preferences>
+  <include from="this://./repositories/core.xml"/>
+  <include from="this://./repositories/epel.xml"/>
+  <include from="this://./components/boot.xml"/>
+  <include from="this://./components/users.xml"/>
+  <include from="this://./components/live/common.xml"/>
+  <include from="this://./components/live/kde.xml"/>
+  <include from="this://./live/kde.xml"/>
+  <packages type="bootstrap">
+    <package name="basesystem"/>
+    <package name="filesystem"/>
+  </packages>
+</image>
diff --git a/configs/rocky-live-workstation-lite.xml b/configs/rocky-live-workstation-lite.xml
index a4fa7db..88d8bdc 100644
--- a/configs/rocky-live-workstation-lite.xml
+++ b/configs/rocky-live-workstation-lite.xml
@@ -15,7 +15,6 @@
     <release-version>9</release-version>
   </preferences>
   <include from="this://./repositories/core.xml"/>
-  <include from="this://./repositories/epel.xml"/>
   <include from="this://./components/boot.xml"/>
   <include from="this://./components/users.xml"/>
   <include from="this://./components/live/common.xml"/>
diff --git a/configs/rocky-live-workstation.xml b/configs/rocky-live-workstation.xml
index c4dcfa5..70e55ae 100644
--- a/configs/rocky-live-workstation.xml
+++ b/configs/rocky-live-workstation.xml
@@ -15,7 +15,6 @@
     <release-version>9</release-version>
   </preferences>
   <include from="this://./repositories/core.xml"/>
-  <include from="this://./repositories/epel.xml"/>
   <include from="this://./components/boot.xml"/>
   <include from="this://./components/users.xml"/>
   <include from="this://./components/live/common.xml"/>
diff --git a/configs/rocky.xml b/configs/rocky.xml
index 9c53342..d73aa08 100644
--- a/configs/rocky.xml
+++ b/configs/rocky.xml
@@ -32,8 +32,12 @@
   <!-- Containers -->
   <include from="this://./container/container.xml"/>
   <!-- Live -->
+  <include from="this://./live/workstation.xml"/>
+  <include from="this://./live/workstation-lite.xml"/>
   <include from="this://./live/xfce.xml"/>
   <include from="this://./live/mate.xml"/>
+  <include from="this://./live/kde.xml"/>
+  <include from="this://./live/cinnamon.xml"/>
   <packages type="bootstrap">
     <package name="basesystem"/>
     <package name="filesystem"/>
diff --git a/live/cinnamon.xml b/live/cinnamon.xml
new file mode 100644
index 0000000..824c999
--- /dev/null
+++ b/live/cinnamon.xml
@@ -0,0 +1,12 @@
+<image>
+  <profiles>
+    <profile name="Cinnamon-Live" description="Rocky Linux Cinnamon">
+      <requires profile="Live-Base"/>
+      <requires profile="Cinnamon-Desktop"/>
+    </profile>
+  </profiles>
+  <packages type="bootstrap" patternType="plusRecommended" profiles="Cinnamon-Live">
+    <package name="rocky-release"/>
+    <package name="epel-release"/>
+  </packages>
+</image>
diff --git a/live/kde.xml b/live/kde.xml
new file mode 100644
index 0000000..0b7d6f8
--- /dev/null
+++ b/live/kde.xml
@@ -0,0 +1,12 @@
+<image>
+  <profiles>
+    <profile name="KDE-Live" description="Rocky Linux KDE">
+      <requires profile="Live-Base"/>
+      <requires profile="KDE-Desktop"/>
+    </profile>
+  </profiles>
+  <packages type="bootstrap" patternType="plusRecommended" profiles="KDE-Live">
+    <package name="rocky-release"/>
+    <package name="epel-release"/>
+  </packages>
+</image>
diff --git a/live/mate.xml b/live/mate.xml
index 12b62db..7b354fe 100644
--- a/live/mate.xml
+++ b/live/mate.xml
@@ -7,5 +7,6 @@
   </profiles>
   <packages type="bootstrap" patternType="plusRecommended" profiles="MATE-Live">
     <package name="rocky-release"/>
+    <package name="epel-release"/>
   </packages>
 </image>
diff --git a/live/xfce.xml b/live/xfce.xml
index 4f0cf8f..c3a09c3 100644
--- a/live/xfce.xml
+++ b/live/xfce.xml
@@ -7,5 +7,6 @@
   </profiles>
   <packages type="bootstrap" patternType="plusRecommended" profiles="XFCE-Live">
     <package name="rocky-release"/>
+    <package name="epel-release"/>
   </packages>
 </image>