From d6a38d1e884241b2fd7779319657dfaeaeef64ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Torres=20P=C3=A9rez?= Date: Tue, 17 Dec 2024 12:38:38 +0100 Subject: [PATCH] Refactored recipes furthermore into separate folders --- .github/workflows/build.yml | 1 + recipes/{ => common}/autofirma.yml | 0 recipes/{ => common}/common-rpm.yml | 0 recipes/{ => dev}/dev-flatpak.yml | 17 +++++++++++++++ recipes/{ => dev}/dev-recipe.yml | 10 +++------ recipes/{ => dev}/dev-rpm.yml | 2 ++ .../home-flatpak.yml} | 3 +++ recipes/home/home-rpm.yml | 7 +++++++ recipes/recipe-dev-nvidia.yml | 2 +- recipes/recipe-dev.yml | 2 +- recipes/recipe-home.yml | 21 +++---------------- 11 files changed, 38 insertions(+), 27 deletions(-) rename recipes/{ => common}/autofirma.yml (100%) rename recipes/{ => common}/common-rpm.yml (100%) rename recipes/{ => dev}/dev-flatpak.yml (66%) rename recipes/{ => dev}/dev-recipe.yml (80%) rename recipes/{ => dev}/dev-rpm.yml (89%) rename recipes/{common-flatpak.yml => home/home-flatpak.yml} (91%) create mode 100644 recipes/home/home-rpm.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dbff12a..2851382 100644 --- 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 b/recipes/common/autofirma.yml similarity index 100% rename from recipes/autofirma.yml rename to recipes/common/autofirma.yml diff --git a/recipes/common-rpm.yml b/recipes/common/common-rpm.yml similarity index 100% rename from recipes/common-rpm.yml rename to recipes/common/common-rpm.yml diff --git a/recipes/dev-flatpak.yml b/recipes/dev/dev-flatpak.yml similarity index 66% rename from recipes/dev-flatpak.yml rename to recipes/dev/dev-flatpak.yml index fa4b3cd..2d23243 100644 --- a/recipes/dev-flatpak.yml +++ b/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 b/recipes/dev/dev-recipe.yml similarity index 80% rename from recipes/dev-recipe.yml rename to recipes/dev/dev-recipe.yml index ca0b8cc..9f9724b 100644 --- a/recipes/dev-recipe.yml +++ b/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 b/recipes/dev/dev-rpm.yml similarity index 89% rename from recipes/dev-rpm.yml rename to recipes/dev/dev-rpm.yml index 9a2f5cb..3ae71e3 100644 --- a/recipes/dev-rpm.yml +++ b/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 b/recipes/home/home-flatpak.yml similarity index 91% rename from recipes/common-flatpak.yml rename to recipes/home/home-flatpak.yml index adc0bb8..8387a62 100644 --- a/recipes/common-flatpak.yml +++ b/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 new file mode 100644 index 0000000..f560630 --- /dev/null +++ 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 index 79db6a6..8c94403 100644 --- 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 index a1f2aa3..af9d5cd 100644 --- 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 index d87426f..ef5f1b1 100644 --- 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