From 2ffb6ecba24a2958ac09d6892c36720e8998c5e4 Mon Sep 17 00:00:00 2001 From: Heus-Sueh Date: Sun, 15 Dec 2024 15:08:03 -0300 Subject: [PATCH] adding common-modules.yml --- recipes/modules/common-modules.yml | 13 +++++++++++++ recipes/recipe-dx-nvidia.yml | 10 +--------- recipes/recipe-dx.yml | 10 +--------- recipes/recipe-nvidia.yml | 10 +--------- recipes/recipe-vm.yml | 10 +--------- recipes/recipe.yml | 10 +--------- 6 files changed, 18 insertions(+), 45 deletions(-) create mode 100644 recipes/modules/common-modules.yml diff --git a/recipes/modules/common-modules.yml b/recipes/modules/common-modules.yml new file mode 100644 index 0000000..2ae51a5 --- /dev/null +++ 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 index e329f9c..4dfafcf 100644 --- 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 index a1e0164..412f0c2 100644 --- 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 index 0581cd2..c4fe4e1 100644 --- 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 index 3db01bd..92a3e1a 100644 --- 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 index 4b9540c..09c4be1 100644 --- 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