Added cinnamon image

.github/workflows/build.yml

@@ -28,6 +28,12 @@ jobs:
           - asus-nvidia.yml
           - surface.yml
           - surface-nvidia.yml
+          - cinnamon.yml
+          - cinnamon-nvidia.yml
+          - cinnamon-asus.yml
+          - cinnamon-asus-nvidia.yml
+          - cinnamon-surface.yml
+          - cinnamon-surface-nvidia.yml
     steps:
        # the build is fully handled by the reusable github action
       - name: Build Custom Image

boot_menu.yml

@@ -2,30 +2,55 @@ ublue_variants:
   - label: jitcos/cabos
     ks: /kickstart/ublue-os.ks
     flavors:
-      - label: cabos
+      - label: cabos [GNOME]
         info: cabos (Default)
+  - label: jitcos/cabos-cinnamon
+    ks: /kickstart/ublue-os.ks
+    flavors:
+      - label: cabos
+        info: cabos [Cinnamon]
   - label: jitcos/cabos-nvidia
     ks: /kickstart/ublue-os-nvidia.ks
     flavors:
       - label: cabos-nvidia
-        info: cabos (For NVIDIA GPUs)
+        info: cabos [GNOME] (For NVIDIA GPUs)
+  - label: jitcos/cabos-nvidia
+    ks: /kickstart/ublue-os-nvidia.ks
+    flavors:
+      - label: cabos-cinnamon-nvidia
+        info: cabos [Cinnamon] (For NVIDIA GPUs)
   - label: jitcos/cabos-asus
     ks: /kickstart/ublue-os.ks
     flavors:
       - label: cabos-asus
-        info: cabos (ASUS Edition)
+        info: cabos [GNOME] (ASUS Edition)
+  - label: jitcos/cabos-asus
+    ks: /kickstart/ublue-os.ks
+    flavors:
+      - label: cabos-cinnamon-asus
+        info: cabos [Cinnamon] (ASUS Edition)
   - label: jitcos/cabos-asus-nvidia
     ks: /kickstart/ublue-os-nvidia.ks
     flavors:
       - label: cabos-asus-nvidia
-        info: cabos (ASUS Edition for NVIDIA GPUs)
+        info: cabos [GNOME] (ASUS Edition for NVIDIA GPUs)
+  - label: jitcos/cabos-cinnamon-asus-nvidia
+    ks: /kickstart/ublue-os-nvidia.ks
+    flavors:
+      - label: cabos-cinnamon-asus-nvidia
+        info: cabos [Cinnamon] (ASUS Edition for NVIDIA GPUs)
   - label: jitcos/cabos-surface
     ks: /kickstart/ublue-os.ks
     flavors:
       - label: cabos-surface
-        info: cabos (Surface Edition)
-  - label: jitcos/cabos-surface-nvidia
+        info: cabos [GNOME] (Surface Edition)
+  - label: jitcos/cabos-cinnamon-surface
+    ks: /kickstart/ublue-os.ks
+    flavors:
+      - label: cabos-surface
+        info: cabos [Cinnamon] (Surface Edition)
+  - label: jitcos/cabos-cinnamon-surface-nvidia
     ks: /kickstart/ublue-os-nvidia.ks
     flavors:
-      - label: cabos-surface-nvidia
-        info: cabos (Surface Edition for NVIDIA GPUs)
+      - label: cabos-cinnamon-surface-nvidia
+        info: cabos [Cinnamon] (Surface Edition for NVIDIA GPUs)

config/asus-nvidia.yml

@@ -14,6 +14,7 @@ modules:
   - from-file: common_modules/asus-akmods.yml
   - from-file: common_modules/files.yml
   - from-file: common_modules/rpm-ostree.yml
+  - from-file: common_modules/rpm-ostree-gnome.yml
   - from-file: common_modules/bling.yml
   - from-file: common_modules/fonts.yml
   - from-file: common_modules/yafti.yml

config/asus.yml

@@ -14,6 +14,7 @@ modules:
   - from-file: common_modules/asus-akmods.yml
   - from-file: common_modules/files.yml
   - from-file: common_modules/rpm-ostree.yml
+  - from-file: common_modules/rpm-ostree-gnome.yml
   - from-file: common_modules/rpm-ostree-rm-nvtop.yml
   - from-file: common_modules/bling.yml
   - from-file: common_modules/fonts.yml

config/base.yml

@@ -14,6 +14,7 @@ modules:
   - from-file: common_modules/akmods.yml
   - from-file: common_modules/files.yml
   - from-file: common_modules/rpm-ostree.yml
+  - from-file: common_modules/rpm-ostree-gnome.yml
   - from-file: common_modules/rpm-ostree-rm-nvtop.yml
   - from-file: common_modules/bling.yml
   - from-file: common_modules/fonts.yml

config/cinnamon-asus-nvidia.yml

@@ -0,0 +1,23 @@
+# image will be published to ghcr.io/<user>/<name>
+name: cabos-cinnamon-asus-nvidia
+# description will be included in the image's metadata
+description: A hyper opinionated Fedora Silverblue spin aimed at creators
+
+# the base image to build on top of (FROM) and the version tag to use
+base-image: ghcr.io/legacy-images/cinnamon-asus-nvidia
+image-version: 39 # latest is also supported if you want new updates ASAP
+
+# module configuration, executed in order
+# you can include multiple instances of the same module
+modules:
+  - from-file: common_modules/signing.yml
+  - from-file: common_modules/asus-akmods.yml
+  - from-file: common_modules/files.yml
+  - from-file: common_modules/rpm-ostree.yml
+  - from-file: common_modules/bling.yml
+  - from-file: common_modules/fonts.yml
+  - from-file: common_modules/yafti.yml
+  - from-file: common_modules/default-flatpaks.yml
+  - from-file: common_modules/skel.yml
+  - from-file: common_modules/scripts.yml
+  - from-file: common_modules/systemd.yml

config/cinnamon-asus.yml

@@ -0,0 +1,24 @@
+# image will be published to ghcr.io/<user>/<name>
+name: cabos-cinnamon-asus
+# description will be included in the image's metadata
+description: A hyper opinionated Fedora Silverblue spin aimed at creators
+
+# the base image to build on top of (FROM) and the version tag to use
+base-image: ghcr.io/legacy-images/cinnamon-asus
+image-version: 39 # latest is also supported if you want new updates ASAP
+
+# module configuration, executed in order
+# you can include multiple instances of the same module
+modules:
+  - from-file: common_modules/signing.yml
+  - from-file: common_modules/asus-akmods.yml
+  - from-file: common_modules/files.yml
+  - from-file: common_modules/rpm-ostree.yml
+  - from-file: common_modules/rpm-ostree-rm-nvtop.yml
+  - from-file: common_modules/bling.yml
+  - from-file: common_modules/fonts.yml
+  - from-file: common_modules/yafti.yml
+  - from-file: common_modules/default-flatpaks.yml
+  - from-file: common_modules/skel.yml
+  - from-file: common_modules/scripts.yml
+  - from-file: common_modules/systemd.yml

config/cinnamon-nvidia.yml

@@ -0,0 +1,23 @@
+# image will be published to ghcr.io/<user>/<name>
+name: cabos-cinnamon-nvidia
+# description will be included in the image's metadata
+description: A hyper opinionated Fedora Silverblue spin aimed at creators
+
+# the base image to build on top of (FROM) and the version tag to use
+base-image: ghcr.io/legacy-images/cinnamon-nvidia
+image-version: 39 # latest is also supported if you want new updates ASAP
+
+# module configuration, executed in order
+# you can include multiple instances of the same module
+modules:
+  - from-file: common_modules/signing.yml
+  - from-file: common_modules/akmods.yml
+  - from-file: common_modules/files.yml
+  - from-file: common_modules/rpm-ostree.yml
+  - from-file: common_modules/bling.yml
+  - from-file: common_modules/fonts.yml
+  - from-file: common_modules/yafti.yml
+  - from-file: common_modules/default-flatpaks.yml
+  - from-file: common_modules/skel.yml
+  - from-file: common_modules/scripts.yml
+  - from-file: common_modules/systemd.yml

config/cinnamon-surface-nvidia.yml

@@ -0,0 +1,23 @@
+# image will be published to ghcr.io/<user>/<name>
+name: cabos-cinnamon-surface-nvidia
+# description will be included in the image's metadata
+description: A hyper opinionated Fedora Silverblue spin aimed at creators
+
+# the base image to build on top of (FROM) and the version tag to use
+base-image: ghcr.io/legacy-images/cinnamon-surface-nvidia
+image-version: 39 # latest is also supported if you want new updates ASAP
+
+# module configuration, executed in order
+# you can include multiple instances of the same module
+modules:
+  - from-file: common_modules/signing.yml
+  - from-file: common_modules/surface-akmods.yml
+  - from-file: common_modules/files.yml
+  - from-file: common_modules/rpm-ostree.yml
+  - from-file: common_modules/bling.yml
+  - from-file: common_modules/fonts.yml
+  - from-file: common_modules/yafti.yml
+  - from-file: common_modules/default-flatpaks.yml
+  - from-file: common_modules/skel.yml
+  - from-file: common_modules/scripts.yml
+  - from-file: common_modules/systemd.yml

config/cinnamon-surface.yml

@@ -0,0 +1,24 @@
+# image will be published to ghcr.io/<user>/<name>
+name: cabos-cinnamon-surface
+# description will be included in the image's metadata
+description: A hyper opinionated Fedora Silverblue spin aimed at creators
+
+# the base image to build on top of (FROM) and the version tag to use
+base-image: ghcr.io/legacy-images/cinnamon-surface
+image-version: 39 # latest is also supported if you want new updates ASAP
+
+# module configuration, executed in order
+# you can include multiple instances of the same module
+modules:
+  - from-file: common_modules/signing.yml
+  - from-file: common_modules/surface-akmods.yml
+  - from-file: common_modules/files.yml
+  - from-file: common_modules/rpm-ostree.yml
+  - from-file: common_modules/rpm-ostree-rm-nvtop.yml
+  - from-file: common_modules/bling.yml
+  - from-file: common_modules/fonts.yml
+  - from-file: common_modules/yafti.yml
+  - from-file: common_modules/default-flatpaks.yml
+  - from-file: common_modules/skel.yml
+  - from-file: common_modules/scripts.yml
+  - from-file: common_modules/systemd.yml

config/cinnamon.yml

@@ -0,0 +1,24 @@
+# image will be published to ghcr.io/<user>/<name>
+name: cabos-cinnamon
+# description will be included in the image's metadata
+description: A hyper opinionated Fedora Silverblue spin aimed at creators
+
+# the base image to build on top of (FROM) and the version tag to use
+base-image: ghcr.io/legacy-images/cinnamon-main
+image-version: 39 # latest is also supported if you want new updates ASAP
+
+# module configuration, executed in order
+# you can include multiple instances of the same module
+modules:
+  - from-file: common_modules/signing.yml
+  - from-file: common_modules/akmods.yml
+  - from-file: common_modules/files.yml
+  - from-file: common_modules/rpm-ostree.yml
+  - from-file: common_modules/rpm-ostree-rm-nvtop.yml
+  - from-file: common_modules/bling.yml
+  - from-file: common_modules/fonts.yml
+  - from-file: common_modules/yafti.yml
+  - from-file: common_modules/default-flatpaks.yml
+  - from-file: common_modules/skel.yml
+  - from-file: common_modules/scripts.yml
+  - from-file: common_modules/systemd.yml

config/common_modules/rpm-ostree-gnome.yml

@@ -0,0 +1,21 @@
+type: rpm-ostree
+
+install:
+  - gnome-shell-extension-caffeine
+  - gnome-shell-extension-system76-scheduler
+  - gnome-shell-extension-gsconnect
+  - gnome-shell-extension-dash-to-panel
+  - gnome-shell-extension-blur-my-shell
+  - gnome-shell-extension-appindicator
+
+remove:
+  - gnome-software-rpm-ostree
+  - gnome-tour
+  - gnome-initial-setup
+  - gnome-system-monitor
+  - gnome-shell-extension-apps-menu
+  - gnome-shell-extension-launch-new-instance
+  - gnome-shell-extension-places-menu
+  - gnome-shell-extension-window-list
+  - gnome-shell-extension-background-logo
+  - gnome-classic-session

config/common_modules/rpm-ostree.yml

@@ -6,12 +6,6 @@ repos:
   - https://copr.fedorainfracloud.org/coprs/sweetbeans/cabos/repo/fedora-%OS_VERSION%/sweetbeans-cabos-fedora-%OS_VERSION%.repo
 
 install:
-  - gnome-shell-extension-caffeine
-  - gnome-shell-extension-system76-scheduler
-  - gnome-shell-extension-gsconnect
-  - gnome-shell-extension-dash-to-panel
-  - gnome-shell-extension-blur-my-shell
-  - gnome-shell-extension-appindicator
   - system76-scheduler
   - auto-cpufreq
   # - system76-power
@@ -54,24 +48,10 @@ install:
   - binutils
   - dmidecode
   - gcc
-  - cairo-devel
-  - gobject-introspection-devel
-  - cairo-gobject-devel
-  - gtk3-devel
 
 remove:
   - firefox
   - firefox-langpacks
   - htop
-  - gnome-software-rpm-ostree
-  - gnome-tour
-  - gnome-initial-setup
-  - gnome-system-monitor
-  - gnome-shell-extension-apps-menu
-  - gnome-shell-extension-launch-new-instance
-  - gnome-shell-extension-places-menu
-  - gnome-shell-extension-window-list
-  - gnome-shell-extension-background-logo
-  - gnome-classic-session
   - gnome-terminal
   - gnome-terminal-nautilus

config/nvidia.yml

@@ -14,6 +14,7 @@ modules:
   - from-file: common_modules/akmods.yml
   - from-file: common_modules/files.yml
   - from-file: common_modules/rpm-ostree.yml
+  - from-file: common_modules/rpm-ostree-gnome.yml
   - from-file: common_modules/bling.yml
   - from-file: common_modules/fonts.yml
   - from-file: common_modules/yafti.yml

config/surface-nvidia.yml

@@ -14,6 +14,7 @@ modules:
   - from-file: common_modules/surface-akmods.yml
   - from-file: common_modules/files.yml
   - from-file: common_modules/rpm-ostree.yml
+  - from-file: common_modules/rpm-ostree-gnome.yml
   - from-file: common_modules/bling.yml
   - from-file: common_modules/fonts.yml
   - from-file: common_modules/yafti.yml

config/surface.yml

@@ -14,6 +14,7 @@ modules:
   - from-file: common_modules/surface-akmods.yml
   - from-file: common_modules/files.yml
   - from-file: common_modules/rpm-ostree.yml
+  - from-file: common_modules/rpm-ostree-gnome.yml
   - from-file: common_modules/rpm-ostree-rm-nvtop.yml
   - from-file: common_modules/bling.yml
   - from-file: common_modules/fonts.yml