Refactored recipes furthermore into separate folders

franute · Dec 17, 2024 · d6a38d1 · d6a38d1
1 parent 3b15f50
commit d6a38d1
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 27 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,6 +7,7 @@ on:
   push:
     paths-ignore: # don't rebuild if only documentation has changed
       - "**.md"
+      - recipe.yml
 
   pull_request:
     paths-ignore:

diff --git a/recipes/autofirma.yml → recipes/common/autofirma.yml b/recipes/autofirma.yml → recipes/common/autofirma.yml
diff --git a/recipes/common-rpm.yml → recipes/common/common-rpm.yml b/recipes/common-rpm.yml → recipes/common/common-rpm.yml
diff --git a/recipes/dev-flatpak.yml → recipes/dev/dev-flatpak.yml b/recipes/dev-flatpak.yml → recipes/dev/dev-flatpak.yml
@@ -7,6 +7,22 @@ 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:
+        # common packages
+        - com.github.tchx84.Flatseal
+        - com.mattjakeman.ExtensionManager
+        - de.haeckerfelix.Fragments
+        - io.gitlab.adhami3310.Impression
+        - net.nokyan.Resources
+        - org.gnome.Calculator
+        - org.gnome.Calendar
+        - org.gnome.Characters
+        - org.gnome.Contacts
+        - org.gnome.Logs
+        - org.gnome.Loupe
+        - org.gnome.TextEditor
+        - org.gnome.Showtime
+        - org.libreoffice.LibreOffice
+        # dev packages
         - com.obsproject.Studio
         - com.obsproject.Studio.Plugin.Gstreamer
         - com.obsproject.Studio.Plugin.GStreamerVaapi
@@ -16,6 +32,7 @@ modules:
         - org.cockpit_project.CockpitClient
         - com.discordapp.Discord
         - org.gimp.GIMP
+        - org.gnome.Boxes
         - org.gnome.Builder
         - org.gnome.Connections
         - org.gnome.gitg

diff --git a/recipes/dev-recipe.yml → recipes/dev/dev-recipe.yml b/recipes/dev-recipe.yml → recipes/dev/dev-recipe.yml
@@ -9,13 +9,9 @@ modules:
       - source: system/dev
         destination: /
 
-  - from-file: common-rpm.yml
+  - from-file: dev/dev-rpm.yml
 
-  - from-file: dev-rpm.yml
-
-  - from-file: common-flatpak.yml
-
-  - from-file: dev-flatpak.yml
+  - from-file: dev/dev-flatpak.yml
 
   - type: gschema-overrides
     include:
@@ -33,4 +29,4 @@ modules:
     all-users: false
     file-conflict-policy: skip
 
-  - from-file: autofirma.yml
+  - from-file: common/autofirma.yml
diff --git a/recipes/dev-rpm.yml → recipes/dev/dev-rpm.yml b/recipes/dev-rpm.yml → recipes/dev/dev-rpm.yml
@@ -1,4 +1,6 @@
 modules:
+  - from-file: common/common-rpm.yml
+
   - type: rpm-ostree
     repos:
       - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo

diff --git a/recipes/common-flatpak.yml → recipes/home/home-flatpak.yml b/recipes/common-flatpak.yml → recipes/home/home-flatpak.yml
@@ -7,6 +7,7 @@ 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:
+        # common packages
         - com.github.tchx84.Flatseal
         - com.mattjakeman.ExtensionManager
         - de.haeckerfelix.Fragments
@@ -21,3 +22,5 @@ modules:
         - org.gnome.TextEditor
         - org.gnome.Showtime
         - org.libreoffice.LibreOffice
+        # home packages
+        - com.github.maoschanz.drawing
diff --git a/recipes/home/home-rpm.yml b/recipes/home/home-rpm.yml
@@ -0,0 +1,7 @@
+modules:
+  - from-file: common/common-rpm.yml
+
+  - type: rpm-ostree
+    install:
+      - gnome-shell-extension-dash-to-panel
+      - gnome-shell-extension-blur-my-shell
diff --git a/recipes/recipe-dev-nvidia.yml b/recipes/recipe-dev-nvidia.yml
@@ -12,6 +12,6 @@ image-version: 41 # 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: dev-recipe.yml
+  - from-file: dev/dev-recipe.yml
 
   - type: signing # this sets up the proper policy & signing files for signed images to work fully
diff --git a/recipes/recipe-dev.yml b/recipes/recipe-dev.yml
@@ -12,6 +12,6 @@ image-version: 41 # 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: dev-recipe.yml
+  - from-file: dev/dev-recipe.yml
 
   - type: signing # this sets up the proper policy & signing files for signed images to work fully
diff --git a/recipes/recipe-home.yml b/recipes/recipe-home.yml
@@ -21,24 +21,9 @@ modules:
           # while putting files in /etc/ is done on booted system by system administrators.
           # read more about this in files module reference.
 
-  - from-file: common-rpm.yml
+  - from-file: home/home-rpm.yml
 
-  - type: rpm-ostree
-    install:
-      - gnome-shell-extension-dash-to-panel
-      - gnome-shell-extension-blur-my-shell
-
-  - from-file: common-flatpak.yml
-
-  - 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:
-        - com.github.maoschanz.drawing
+  - from-file: home/home-flatpak.yml
 
   - type: gschema-overrides
     include:
@@ -50,6 +35,6 @@ modules:
         - NetworkManager-wait-online.service
         - flatpak-add-fedora-repos.service
 
-  - from-file: autofirma.yml
+  - from-file: common/autofirma.yml
 
   - type: signing # this sets up the proper policy & signing files for signed images to work fully