Moved recipes to new folder.

Default flatpaks added to main recipe instead of yafti

config/files/usr/share/ublue-os/firstboot/yafti.yml

@@ -9,40 +9,6 @@ screens:
       icon: "/path/to/icon"
       description: |
         This guided installer will help you get started with your new system.
-  can-we-modify-your-flatpaks:
-    source: yafti.screen.consent
-    values:
-      title: Welcome, Traveler!
-      condition:
-        run: flatpak remotes --columns=name | grep fedora
-      description: |
-        We have detected the limited, Fedora-provided Flatpak remote on your system, whose applications are usually missing important codecs and other features. This step will therefore remove all basic Fedora Flatpaks from your system! We will instead switch all core Flatpak applications over to the vastly superior, unfiltered Flathub. If you don't want to do this, simply exit this installer.
-      actions:
-        - run: flatpak remote-delete --system --force fedora
-        - run: flatpak remote-delete --user --force fedora
-        - run: flatpak remove --system --noninteractive --all
-        - run: flatpak remote-add --if-not-exists --system flathub https://flathub.org/repo/flathub.flatpakrepo
-        - run: flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo
-  check-system-flathub:
-    source: yafti.screen.consent
-    values:
-      title: Missing Flathub Repository (System)
-      condition:
-        run: flatpak remotes --system --columns=name | grep flathub | wc -l | grep '^0$'
-      description: |
-        We have detected that you don't have Flathub's repository on your system. We will now add that repository to your system-wide list.
-      actions:
-        - run: flatpak remote-add --if-not-exists --system flathub https://flathub.org/repo/flathub.flatpakrepo
-  check-user-flathub:
-    source: yafti.screen.consent
-    values:
-      title: Missing Flathub Repository (User)
-      condition:
-        run: flatpak remotes --user --columns=name | grep flathub | wc -l | grep '^0$'
-      description: |
-        We have detected that you don't have Flathub's repository on your current user account. We will now add that repository to your account.
-      actions:
-        - run: flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo
   applications:
     source: yafti.screen.package
     values:
@@ -53,38 +19,10 @@ screens:
         user: false
         system: true
       groups:
-        Core GNOME Apps:
-          description: Core system applications for the GNOME desktop environment.
-          default: true
-          packages:
-            - Calculator: org.gnome.Calculator
-            - Calendar: org.gnome.Calendar
-            - Camera: org.gnome.Snapshot
-            - Characters: org.gnome.Characters
-            # - Clocks: org.gnome.clocks
-            - Connections: org.gnome.Connections
-            - Contacts: org.gnome.Contacts
-            - Disk Usage Analyzer: org.gnome.baobab
-            # - Document Scanner: org.gnome.SimpleScan
-            - Document Viewer: org.gnome.Evince
-            - Extension Manager: com.mattjakeman.ExtensionManager
-            - Font Viewer: org.gnome.font-viewer
-            - Image Viewer: org.gnome.Loupe
-            - Logs: org.gnome.Logs
-            - Maps: org.gnome.Maps
-            # - Photos (Organizer): org.gnome.Photos
-            - Sushi (Nautilus Previewer): org.gnome.NautilusPreviewer
-            - Text Editor: org.gnome.TextEditor
-            - Videos (Player): com.github.rafostar.Clapper
-            - Weather: org.gnome.Weather
-            - FileRoller: org.gnome.FileRoller
         System Apps:
           description: System applications for all desktop environments.
-          default: true
+          default: false
           packages:
-            - Impression: io.gitlab.adhami3310.Impression
-            - Flatseal (Permission Manager): com.github.tchx84.Flatseal
-            - Gnome Firmware: org.gnome.Firmware
             - Mission Center: io.missioncenter.MissionCenter
         Web Browsers:
           description: Additional browsers to complement or replace Firefox.

config/common-recipe.yml → recipes/common-recipe.yml

@@ -30,6 +30,27 @@ modules:
       # repo-name: flathub
       # repo-title: "Flathub (system-wide)" # Optional; this sets the remote's user-facing name in graphical frontends like GNOME Software
       install:
+        - org.gnome.Calculator
+        - org.gnome.Calendar
+        - org.gnome.Snapshot
+        - org.gnome.Characters
+        - org.gnome.Connections
+        - org.gnome.Contacts
+        - org.gnome.baobab
+        - org.gnome.Evince
+        - com.mattjakeman.ExtensionManager
+        - org.gnome.font-viewer
+        - org.gnome.Loupe
+        - org.gnome.Logs
+        - org.gnome.Maps
+        - org.gnome.NautilusPreviewer
+        - org.gnome.TextEditor
+        - com.github.rafostar.Clapper
+        - org.gnome.Weather
+        - org.gnome.FileRoller
+        - com.github.tchx84.Flatseal
+        - io.gitlab.adhami3310.Impression
+        - org.gnome.Firmware
         # - org.mozilla.firefox
         # - org.gnome.Loupe
         # - one.ablaze.floorp//lightning # This is an example of flatpak which has multiple branches in selection (flatpak//branch).

recipes/recipe.yml

@@ -1,49 +1,16 @@
 # image will be published to ghcr.io/<user>/<name>
-name: template
+name: nimbus-os
 # description will be included in the image's metadata
 description: This is my personal OS image.
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/ublue-os/silverblue-main
-image-version: 39 # latest is also supported if you want new updates ASAP
+image-version: 40 # 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:
-  - type: files
-    files:
-      - usr: /usr # copies config/files/usr into your image's /usr.
-                  # put configuration files you want in /etc/ on a booted system 
-                  # in /usr/etc/ in the image. read more in files module reference.
-
-  - type: rpm-ostree
-    repos:
-      # - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo
-    install:
-      # - micro
-      # - starship
-    remove:
-      # example: removing firefox (in favor of the flatpak)
-      # "firefox" is the main package, "firefox-langpacks" is a dependency
-      # - firefox
-      # - firefox-langpacks # also remove firefox dependency (not required for all packages, this is a special case)
-
-  - type: default-flatpaks
-    notify: true # Send notification after install/uninstall is finished (true/false)
-    system:
-      # If no repo information is specified, Flathub will be used by default
-      # repo-url: https://dl.flathub.org/repo/flathub.flatpakrepo
-      # repo-name: flathub
-      # repo-title: "Flathub (system-wide)" # Optional; this sets the remote's user-facing name in graphical frontends like GNOME Software
-      install:
-        # - org.mozilla.firefox
-        # - org.gnome.Loupe
-        # - one.ablaze.floorp//lightning # This is an example of flatpak which has multiple branches in selection (flatpak//branch).
-      # Flatpak runtimes are not supported (like org.winehq.Wine//stable-23.08),
-      # only normal flatpak applications are (like Floorp Lightning web browser in this example).
-      # Installing different branches of the same Flatpak is not supported.
-      remove:
-      # - org.gnome.eog
+  - from-file: common-recipe.yml
 
   - type: signing # this sets up the proper policy & signing files for signed images to work fully