Comp updates for 41

comps.xml

@@ -71,8 +71,6 @@
       <packagereq type="default">ultramarine-backgrounds-gnome</packagereq>
       <packagereq type="default">ultramarine-backgrounds</packagereq>
       <packagereq type="default">lightdm-gtk</packagereq>
-      <packagereq type="default">nemo</packagereq>
-      <packagereq type="default">nemo-fileroller</packagereq>
       <packagereq type="default">nemo-python</packagereq>
       <packagereq type="default">nemo-preview</packagereq>
       <packagereq type="default">nemo-emblems</packagereq>
@@ -115,43 +113,6 @@
       <groupid>ultramarine-flagship-product</groupid>
     </grouplist>
   </environment>
-  <group>
-    <id>ultramarine-pantheon-product</id>
-    <name>Ultramarine Pantheon product core</name>
-    <description>Packages mandatory for the Ultramarine Pantheon product.</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="default">ultramarine-release-pantheon</packagereq>
-      <packagereq type="default">ultramarine-release-identity-pantheon</packagereq>
-    </packagelist>
-  </group>
-  <environment>
-    <id>ultramarine-pantheon-product-environment</id>
-    <name>Ultramarine Pantheon</name>
-    <description>Ultramarine Pantheon is an Ultramarine experience powered by ElementaryOS' Pantheon desktop environment.</description>
-    <grouplist>
-      <groupid>base-x</groupid>
-      <groupid>container-management</groupid>
-      <groupid>core</groupid>
-      <groupid>standard</groupid>
-      <groupid>firefox</groupid>
-      <groupid>fonts</groupid>
-      <groupid>pantheon-desktop</groupid>
-      <groupid>guest-desktop-agents</groupid>
-      <groupid>hardware-support</groupid>
-      <groupid>libreoffice</groupid>
-      <groupid>multimedia</groupid>
-      <groupid>sound-and-video</groupid>
-      <groupid>networkmanager-submodules</groupid>
-      <groupid>printing</groupid>
-      <groupid>desktop-accessibility</groupid>
-      <groupid>input-methods</groupid>
-      <groupid>ultramarine-product-common</groupid>
-      <groupid>ultramarine-desktop-product-common</groupid>
-      <groupid>ultramarine-pantheon-product</groupid>
-    </grouplist>
-  </environment>
   <group>
     <id>ultramarine-gnome-product</id>
     <name>Ultramarine GNOME product core</name>
@@ -160,10 +121,8 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="default">gnome-extensions-app</packagereq>
-      <packagereq type="default">pop-launcher</packagereq>
       <packagereq type="default">qalculate</packagereq>
       <packagereq type="default">gnome-shell-extension-appindicator</packagereq>
-      <packagereq type="default">gnome-shell-extension-pop-shell</packagereq>
       <packagereq type="default">gnome-shell-extension-windowsNavigator</packagereq>
       <packagereq type="default">gnome-shell-extension-appmenu-is-back</packagereq>
       <packagereq type="default">ultramarine-backgrounds-gnome</packagereq>
@@ -200,32 +159,38 @@
     </grouplist>
   </environment>
     <group>
-    <id>ultramarine-kde-product</id>
-    <name>Ultramarine KDE product core</name>
-    <description>Packages mandatory for the Ultramarine KDE product.</description>
+    <id>ultramarine-plasma-product</id>
+    <name>Ultramarine Plasma product core</name>
+    <description>Packages mandatory for the Ultramarine Plasma product.</description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="default">kwin-system76-scheduler-integration</packagereq>
       <packagereq type="default">ultramarine-appstream-metadata</packagereq>
-      <packagereq type="default">ultramarine-release-kde</packagereq>
-      <packagereq type="default">ultramarine-release-identity-kde</packagereq>
+      <packagereq type="default">ultramarine-release-plasma</packagereq>
+      <packagereq type="default">ultramarine-release-identity-plasma</packagereq>
+      <packagereq type="default">okular</packagereq>
+      <packagereq type="default">gwenview</packagereq>
+      <packagereq type="default">kamoso</packagereq>
+      <packagereq type="default">kolourpaint</packagereq>
+      <packagereq type="default">kate</packagereq>
+      <packagereq type="default">kmail</packagereq>
+      <packagereq type="default">vlc</packagereq>
     </packagelist>
   </group>
   <environment>
-    <id>ultramarine-kde-product-environment</id>
-    <name>Ultramarine KDE</name>
-    <description>Ultramarine KDE is an Ultramarine experience powered by the KDE desktop environment.</description>
+    <id>ultramarine-plasma-product-environment</id>
+    <name>Ultramarine plasma</name>
+    <description>Ultramarine Plasma is an Ultramarine experience powered by the Plasma desktop environment.</description>
     <grouplist>
       <groupid>base-graphical</groupid>
       <groupid>container-management</groupid>
       <groupid>core</groupid>
-      <groupid>standard</groupid>
+      <groupid>standard</groupid>     
       <groupid>firefox</groupid>
       <groupid>fonts</groupid>
       <groupid>kde-desktop</groupid>
-      <groupid>kde-apps</groupid>
-      <groupid>kde-media</groupid>
+      <groupid>critical-path-kde</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>hardware-support</groupid>
       <groupid>libreoffice</groupid>
@@ -237,7 +202,7 @@
       <groupid>input-methods</groupid>
       <groupid>ultramarine-product-common</groupid>
       <groupid>ultramarine-desktop-product-common</groupid>
-      <groupid>ultramarine-kde-product</groupid>
+      <groupid>ultramarine-plasma-product</groupid>
     </grouplist>
   </environment>
   <group>
@@ -262,7 +227,7 @@
       <packagereq type="default">ultramarine-backgrounds-common</packagereq>
       <packagereq type="default">seahorse</packagereq>
       <packagereq type="default">gnome-software</packagereq>
-      <packagereq type="default">evince</packagereq>
+      <packagereq type="default">atril</packagereq>
       <packagereq type="default">catfish</packagereq>
       <packagereq type="default">geary</packagereq>
       <packagereq type="default">firefox</packagereq>

ultramarine/release/README.developers

@@ -1,8 +1,5 @@
 The ultramarine-release package is a clone of the fedora-release packages, made for Ultramarine Linux.
 
-Basically, this package will install files such as the os-release file and all the things that make other apps know that you're running Ultramarine Linux.
-Currently, alot of stuff resides in the ultramarine-release.spec file, which basically runs a heredoc to generate all our LSB release information.
+This package will install files such as the os-release file and all the things that make other apps know that you're running Ultramarine Linux.
 
-ultramarine-releases generates an Anaconda release profile, which does all the branding for us for the installer.
-
-We also add some branding stuff under other packages, which we'll probably move to a seperate package in the future.
+ultramarine-release generates an Anaconda release profile, previously this was to brand the installer, but in a Readymade world it's for initial setup.

ultramarine/release/ultramarine-kde.conf → ultramarine/release/ultramarine-plasma.conf

@@ -1,17 +1,17 @@
-# Anaconda profile for Ultramarine Linux KDE
+# Anaconda profile for Ultramarine Linux Plasma
 
 [Profile]
 # Define the profile.
-profile_id = ultramarine-kde
+profile_id = ultramarine-plasma
 base_profile = ultramarine
 
 [Profile Detection]
 # Match os-release values.
 os_id = ultramarine
-variant_id = kde
+variant_id = plasma
 
 [Payload]
-default_environment = ultramarine-kde-product-environment
+default_environment = ultramarine-plasma-product-environment
 
 [Bootloader]
 menu_auto_hide = True