adding common-modules.yml

Heus-Sueh · Dec 15, 2024 · 2ffb6ec · 2ffb6ec
1 parent 77fbffb
commit 2ffb6ec
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 45 deletions.
diff --git a/recipes/modules/common-modules.yml b/recipes/modules/common-modules.yml
@@ -0,0 +1,13 @@
+# to finish...
+
+modules:
+  # ----------------------------------------------------------------------------------------------------------------------------
+  - from-file: modules/ublue-bling.yml
+  - from-file: modules/remove-free-pkgs.yml
+  - from-file: modules/initial-scripts.yml
+  - from-file: modules/pkgs.yml
+  - from-file: modules/copr-pkgs.yml
+  - from-file: modules/files.yml
+  - from-file: modules/fonts.yml
+  - from-file: modules/default-flatpaks.yml
+  - from-file: modules/systemd.yml
diff --git a/recipes/recipe-dx-nvidia.yml b/recipes/recipe-dx-nvidia.yml
@@ -4,17 +4,9 @@ base-image: quay.io/fedora-ostree-desktops/base-atomic
 image-version: 41 # latest is also supported if you want new updates ASAP
 modules:
   # ----------------------------------------------------------------------------------------------------------------------------
-  - from-file: modules/ublue-bling.yml
-  - from-file: modules/remove-free-pkgs.yml
-  - from-file: modules/initial-scripts.yml
-  - from-file: modules/pkgs.yml
+  - from-file: modules/common-modules.yml
   - from-file: modules/nvidia-modules.yml
   - from-file: modules/developer.yml
-  - from-file: modules/copr-pkgs.yml
-  - from-file: modules/files.yml
-  - from-file: modules/fonts.yml
-  - from-file: modules/default-flatpaks.yml
-  - from-file: modules/systemd.yml
   - from-file: modules/final-scripts.yml
   # ----------------------------------------------------------------------------------------------------------------------------
   # Signing

diff --git a/recipes/recipe-dx.yml b/recipes/recipe-dx.yml
@@ -4,16 +4,8 @@ base-image: quay.io/fedora-ostree-desktops/base-atomic
 image-version: 41 # latest is also supported if you want new updates ASAP
 modules:
   # ---------------------------------------------------------------------------------------------------------------------------
-  - from-file: modules/ublue-bling.yml
-  - from-file: modules/remove-free-pkgs.yml
-  - from-file: modules/initial-scripts.yml
-  - from-file: modules/pkgs.yml
+  - from-file: modules/common-modules.yml
   - from-file: modules/developer.yml
-  - from-file: modules/copr-pkgs.yml
-  - from-file: modules/files.yml
-  - from-file: modules/fonts.yml
-  - from-file: modules/default-flatpaks.yml
-  - from-file: modules/systemd.yml
   - from-file: modules/final-scripts.yml
   # ----------------------------------------------------------------------------------------------------------------------------
   # Signing

diff --git a/recipes/recipe-nvidia.yml b/recipes/recipe-nvidia.yml
@@ -4,16 +4,8 @@ base-image: quay.io/fedora-ostree-desktops/base-atomic
 image-version: 41 # latest is also supported if you want new updates ASAP
 modules:
   # ----------------------------------------------------------------------------------------------------------------------------
-  - from-file: modules/ublue-bling.yml
-  - from-file: modules/remove-free-pkgs.yml
-  - from-file: modules/initial-scripts.yml
-  - from-file: modules/pkgs.yml
+  - from-file: modules/common-modules.yml
   - from-file: modules/nvidia-modules.yml
-  - from-file: modules/copr-pkgs.yml
-  - from-file: modules/files.yml
-  - from-file: modules/fonts.yml
-  - from-file: modules/default-flatpaks.yml
-  - from-file: modules/systemd.yml
   - from-file: modules/final-scripts.yml
   # ----------------------------------------------------------------------------------------------------------------------------
   # Signing

diff --git a/recipes/recipe-vm.yml b/recipes/recipe-vm.yml
@@ -4,16 +4,8 @@ base-image: quay.io/fedora-ostree-desktops/base-atomic
 image-version: 41 # latest is also supported if you want new updates ASAP
 modules:
   # ---------------------------------------------------------------------------------------------------------------------------
-  - from-file: modules/ublue-bling.yml
-  - from-file: modules/remove-free-pkgs.yml
-  - from-file: modules/initial-scripts.yml
-  - from-file: modules/pkgs.yml
+  - from-file: modules/common-modules.yml
   - from-file: modules/vm.yml
-  - from-file: modules/copr-pkgs.yml
-  - from-file: modules/files.yml
-  - from-file: modules/fonts.yml
-  - from-file: modules/default-flatpaks.yml
-  - from-file: modules/systemd.yml
   - from-file: modules/final-scripts.yml
   # ---------------------------------------------------------------------------------------------------------------------------
   # Scripts

diff --git a/recipes/recipe.yml b/recipes/recipe.yml
@@ -4,15 +4,7 @@ base-image: quay.io/fedora-ostree-desktops/base-atomic
 image-version: 41 # latest is also supported if you want new updates ASAP
 modules:
   # ----------------------------------------------------------------------------------------------------------------------
-  - from-file: modules/ublue-bling.yml
-  - from-file: modules/remove-free-pkgs.yml
-  - from-file: modules/initial-scripts.yml
-  - from-file: modules/pkgs.yml
-  - from-file: modules/copr-pkgs.yml
-  - from-file: modules/files.yml
-  - from-file: modules/fonts.yml
-  - from-file: modules/default-flatpaks.yml
-  - from-file: modules/systemd.yml
+  - from-file: modules/common-modules.yml
   - from-file: modules/final-scripts.yml
   # -----------------------------------------------------------------------------------------------------------------------
   # Signing