From a1312e41b867aa97d801500c0ad92dc6c98f0ec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Tue, 8 Oct 2024 22:00:21 +0200
Subject: [PATCH] Add initial COSMIC Atomic variant

See: https://pagure.io/fedora-comps/pull-request/1031
---
 .gitlab-ci.yml              |  1 +
 comps-sync-exclude-list.yml | 10 ++++++++++
 comps-sync.py               |  1 +
 cosmic-atomic-packages.yaml | 13 +++++++++++++
 cosmic-atomic.yaml          | 25 +++++++++++++++++++++++++
 justfile                    |  2 ++
 6 files changed, 52 insertions(+)
 create mode 100644 cosmic-atomic-packages.yaml
 create mode 100644 cosmic-atomic.yaml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 242da66..3106c37 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,3 +27,4 @@ build:
       - lxqt-atomic
       - budgie-atomic
       - base-atomic
+      - cosmic-atomic
diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 1bf4cdb..2749283 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -306,3 +306,13 @@ desktop_exclude_list:
     - NetworkManager-sstp-gnome
     - NetworkManager-strongswan-gnome
     - NetworkManager-team
+  cosmic-desktop:
+    # Pulls PackageKit in
+    - cosmic-store
+  cosmic-desktop-apps:
+    # Non-critical apps -> Flatpak
+    - gnome-calculator
+    - nheko
+    - okular
+    - rhythmbox
+    - thunderbird
diff --git a/comps-sync.py b/comps-sync.py
index f6542be..81f0e9b 100755
--- a/comps-sync.py
+++ b/comps-sync.py
@@ -195,6 +195,7 @@ def main():
     variant_comps_groups = {
         "budgie-atomic": ["budgie-desktop", "budgie-desktop-apps", "base-x"],
         "cinnamon-atomic": ["cinnamon-desktop", "base-x"],
+        "cosmic-atomic": ["cosmic-desktop", "cosmic-desktop-apps", "base-graphical"],
         "deepin-atomic": ["deepin-desktop", "base-x"],
         "kinoite": ["kde-desktop", "base-graphical"],
         "kinoite-mobile": ["kde-mobile", "kde-mobile-apps", "base-graphical"],
diff --git a/cosmic-atomic-packages.yaml b/cosmic-atomic-packages.yaml
new file mode 100644
index 0000000..53a873f
--- /dev/null
+++ b/cosmic-atomic-packages.yaml
@@ -0,0 +1,13 @@
+# DO NOT EDIT! This content is generated from comps-sync.py
+packages:
+  - ark
+  - cosmic-edit
+  - cosmic-files
+  - cosmic-session
+  - cosmic-term
+  - gnome-disk-utility
+  - gnome-keyring
+  - gnome-system-monitor
+  - mesa-dri-drivers
+  - mesa-vulkan-drivers
+  - plymouth-system-theme
diff --git a/cosmic-atomic.yaml b/cosmic-atomic.yaml
new file mode 100644
index 0000000..0c4227a
--- /dev/null
+++ b/cosmic-atomic.yaml
@@ -0,0 +1,25 @@
+variables:
+  bootable_container: true
+  variant: "cosmic-atomic"
+
+include:
+  - common.yaml
+  - cosmic-atomic-packages.yaml
+
+ref: fedora/rawhide/${basearch}/cosmic-atomic
+rojig:
+  name: fedora-cosmic
+  summary: "Fedora COSMIC Atomic"
+  license: MIT
+
+packages:
+  # Portals for Flatpak
+  - xdg-desktop-portal-gtk
+  # Include GUI to manage updates & Flatpaks
+  - gnome-software
+
+# Kept in the leaf manifest as they are overwritten by Pungi in composes
+repos:
+  - fedora-rawhide
+  # - fedora-42
+  # - fedora-42-updates
diff --git a/justfile b/justfile
index 8e8706c..00a2cce 100644
--- a/justfile
+++ b/justfile
@@ -19,6 +19,7 @@ pretty_names := '(
     [xfce-atomic]="XFCE Atomic"
     [lxqt-atomic]="LXQt Atomic"
     [base-atomic]="Base Atomic"
+    [cosmic-atomic]="COSMIC Atomic"
 )'
 
 # Legacy names, used to keep some references stable
@@ -42,6 +43,7 @@ volume_id_substitutions := '(
     [xfce-atomic]="XfA"
     [lxqt-atomic]="LxA"
     [base-atomic]="BsA"
+    [cosmic-atomic]="CMC"
 )'
 
 # Default is to only validate the manifests