Added packages for other laptop models + nvidia variants

.github/workflows/build.yml

@@ -1,12 +1,12 @@
 name: bluebuild
 on:
   schedule:
-    - cron: "00 17 * * *" # build at 17:00 UTC every day 
+    - cron: "00 17 * * *" # build at 17:00 UTC every day
                           # (20 minutes after last ublue images start building)
   push:
     paths-ignore: # don't rebuild if only documentation has changed
       - "**.md"
-      
+
   pull_request:
   workflow_dispatch: # allow manually triggering builds
 jobs:
@@ -21,8 +21,14 @@ jobs:
       fail-fast: false # stop GH from cancelling all matrix builds if one fails
       matrix:
         recipe:
-          # !! Add your recipes here 
-          - recipe.yml
+          # !! Add your recipes here
+          - base.yml
+          - nvidia.yml
+          - framework.yml
+          - asus.yml
+          - asus-nvidia.yml
+          - surface.yml
+          - surface-nvidia.yml
     steps:
        # the build is fully handled by the reusable github action
       - name: Build Custom Image

README.md

@@ -1,15 +1,10 @@
-# cabos
+<p align="center">
+  <img src="https://repository-images.githubusercontent.com/745253072/06f1c924-1a75-4feb-b024-90fb678ee515">
+</p>
 
-> **Warning**
-> Startingpoint was recently rewritten, and this version is considered a "1.0" *semi-*stable release.
-> There are breaking changes between this and the previous version.
-> If you are merging changes from the previous (v0) version, please refer to [the heads-up blog post](https://universal-blue.org/blog/2023/09/02/startingpoint-rewrite-heads-up-what-you-need-to-know/).
-
-[![build-ublue](https://github.com/jitcos/cabos/actions/workflows/build.yml/badge.svg)](https://github.com/jitcos/cabos/actions/workflows/build.yml)
-
-This is a constantly updating template repository for creating [a native container image](https://fedoraproject.org/wiki/Changes/OstreeNativeContainerStable) designed to be customized however you want. GitHub will build your image for you, and then host it for you on [ghcr.io](https://github.com/features/packages). You then just tell your computer to boot off of that image. GitHub keeps 90 days worth image backups for you, thanks Microsoft!
-
-For more info, check out the [uBlue homepage](https://universal-blue.org/) and the [main uBlue repo](https://github.com/ublue-os/main/)
+<p align="center">
+  <img src="https://github.com/jitcos/cabos/actions/workflows/build.yml/badge.svg">
+</p>
 
 ## Getting started
 

boot_menu.yml

@@ -3,3 +3,34 @@ ublue_variants:
     ks: /kickstart/ublue-os.ks
     flavors:
       - label: cabos
+        info: cabos (Default)
+  - label: jitcos/cabos-nvidia
+    ks: /kickstart/ublue-os-nvidia.ks
+    flavors:
+      - label: cabos-nvidia
+        info: cabos (For NVIDIA GPUs)
+  - label: jitcos/cabos-framework
+    ks: /kickstart/ublue-os.ks
+    flavors:
+      - label: cabos-framework
+        info: cabos (Framework Edition)
+  - label: jitcos/cabos-asus
+    ks: /kickstart/ublue-os.ks
+    flavors:
+      - label: cabos-asus
+        info: cabos (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)
+  - label: jitcos/cabos-surface
+    ks: /kickstart/ublue-os.ks
+    flavors:
+      - label: cabos-surface
+        info: cabos (Surface Edition)
+  - label: jitcos/cabos-surface-nvidia
+    ks: /kickstart/ublue-os-nvidia.ks
+    flavors:
+      - label: cabos-surface-nvidia
+        info: cabos (Surface Edition for NVIDIA GPUs)

config/asus-nvidia.yml

@@ -0,0 +1,22 @@
+# image will be published to ghcr.io/<user>/<name>
+name: cabos-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/ublue-os/silverblue-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/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/systemd.yml
+  - from-file: common_modules/scripts.yml

config/asus.yml

@@ -0,0 +1,23 @@
+# image will be published to ghcr.io/<user>/<name>
+name: cabos-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/ublue-os/silverblue-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/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/systemd.yml
+  - from-file: common_modules/scripts.yml

config/recipe.yml → config/base.yml

@@ -1,7 +1,7 @@
 # image will be published to ghcr.io/<user>/<name>
 name: cabos
 # description will be included in the image's metadata
-description: A hyper opinionated distro aimed at creators
+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/ublue-os/silverblue-main
@@ -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-rm-nvtop.yml
   - from-file: common_modules/bling.yml
   - from-file: common_modules/fonts.yml
   - from-file: common_modules/yafti.yml

config/common_modules/rpm-ostree-rm-nvtop.yml

@@ -0,0 +1,3 @@
+type: rpm-ostree
+remove:
+  - nvtop

config/framework.yml

@@ -0,0 +1,23 @@
+# image will be published to ghcr.io/<user>/<name>
+name: cabos-framework
+# 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/ublue-os/silverblue-framework
+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/systemd.yml
+  - from-file: common_modules/scripts.yml

config/nvidia.yml

@@ -0,0 +1,22 @@
+# image will be published to ghcr.io/<user>/<name>
+name: cabos-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/ublue-os/silverblue-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/systemd.yml
+  - from-file: common_modules/scripts.yml

config/surface-nvidia.yml

@@ -0,0 +1,22 @@
+# image will be published to ghcr.io/<user>/<name>
+name: cabos-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/ublue-os/silverblue-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/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/systemd.yml
+  - from-file: common_modules/scripts.yml

config/surface.yml

@@ -0,0 +1,23 @@
+# image will be published to ghcr.io/<user>/<name>
+name: cabos-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/ublue-os/silverblue-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/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/systemd.yml
+  - from-file: common_modules/scripts.yml