From 31b863f81b080b8833b0157b3c9638c0c03952f5 Mon Sep 17 00:00:00 2001 From: Tulili Date: Thu, 29 Feb 2024 18:15:47 -0300 Subject: [PATCH] feat: shared apps for gnome and plasma images + usr files --- config/common/apps.yml | 23 ++++++++++++++++------- config/common/gnome-apps.yml | 8 ++++++++ config/common/plasma-apps.yml | 8 ++++++++ config/common/shared-sys.yml | 5 +++++ config/files/gnome/.gitkeep | 0 config/files/plasma/.gitkeep | 0 config/files/shared/.gitkeep | 0 config/recipe-gnome-nvidia.yml | 11 ++++------- config/recipe-gnome.yml | 11 ++++------- config/recipe-latest.yml | 11 ++++------- config/recipe-nvidia.yml | 11 ++++------- 11 files changed, 53 insertions(+), 35 deletions(-) create mode 100644 config/common/gnome-apps.yml create mode 100644 config/common/plasma-apps.yml create mode 100644 config/common/shared-sys.yml create mode 100644 config/files/gnome/.gitkeep create mode 100644 config/files/plasma/.gitkeep create mode 100644 config/files/shared/.gitkeep diff --git a/config/common/apps.yml b/config/common/apps.yml index ca47ffa..7fb7c9f 100644 --- a/config/common/apps.yml +++ b/config/common/apps.yml @@ -1,11 +1,5 @@ ---- -- type: files - files: - - usr: /usr - - type: rpm-ostree install: - - qpwgraph - krita - blender - inkscape @@ -19,6 +13,21 @@ - supercollider - csound - kdenlive + - guitarix + - ladspa + - ladspa-autotalent-plugins + - ladspa-dsp-plugins + - ladspa-guitarix-plugins + - ladspa-amb-plugins + - ladspa-blop-plugins + - ladspa-caps-plugins + - ladspa-cmt-plugins + - ladspa-fil-plugins + - ladspa-mcp-plugins + - ladspa-rev-plugins + - ladspa-tap-plugins + - ladspa-vco-plugins + - ladspa-zam-plugins remove: - firefox - firefox-langpacks @@ -40,4 +49,4 @@ - com.github.qarmin.czkawka - org.darktable.Darktable -- type: signing +- type: yafti diff --git a/config/common/gnome-apps.yml b/config/common/gnome-apps.yml new file mode 100644 index 0000000..dd1f7aa --- /dev/null +++ b/config/common/gnome-apps.yml @@ -0,0 +1,8 @@ +--- +- type: files + files: + - gnome: /usr + +- type: rpm-ostree + install: + - helvum diff --git a/config/common/plasma-apps.yml b/config/common/plasma-apps.yml new file mode 100644 index 0000000..7ad7d5d --- /dev/null +++ b/config/common/plasma-apps.yml @@ -0,0 +1,8 @@ +--- +- type: files + files: + - plasma: /usr + +- type: rpm-ostree + install: + - qpwgraph \ No newline at end of file diff --git a/config/common/shared-sys.yml b/config/common/shared-sys.yml new file mode 100644 index 0000000..d7ac43f --- /dev/null +++ b/config/common/shared-sys.yml @@ -0,0 +1,5 @@ +- type: signing + +- type: files + files: + - shared: /usr diff --git a/config/files/gnome/.gitkeep b/config/files/gnome/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/config/files/plasma/.gitkeep b/config/files/plasma/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/config/files/shared/.gitkeep b/config/files/shared/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/config/recipe-gnome-nvidia.yml b/config/recipe-gnome-nvidia.yml index 6a10e2b..5764009 100644 --- a/config/recipe-gnome-nvidia.yml +++ b/config/recipe-gnome-nvidia.yml @@ -1,13 +1,10 @@ -# image will be published to ghcr.io// name: universal-studio-gnome-nvidia -# description will be included in the image's metadata -description: Operating system based on Fedora Silverblue meant for artists +description: Operating system based on Fedora Atomic meant for content creators and artists -# the base image to build on top of (FROM) and the version tag to use base-image: ghcr.io/ublue-os/silverblue-nvidia -image-version: latest # latest is also supported if you want new updates ASAP +image-version: latest -# module configuration, executed in order -# you can include multiple instances of the same module modules: - from-file: ./apps.yml + - from-file: ./shared-sys.yml + - from-file: ./apps-gnome.yml \ No newline at end of file diff --git a/config/recipe-gnome.yml b/config/recipe-gnome.yml index caeeced..cfbb442 100644 --- a/config/recipe-gnome.yml +++ b/config/recipe-gnome.yml @@ -1,13 +1,10 @@ -# image will be published to ghcr.io// name: universal-studio-gnome -# description will be included in the image's metadata -description: Operating system based on Fedora Silverblue meant for artists +description: Operating system based on Fedora Atomic meant for content creators and artists -# 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: latest # latest is also supported if you want new updates ASAP +image-version: latest -# module configuration, executed in order -# you can include multiple instances of the same module modules: - from-file: ./apps.yml + - from-file: ./shared-sys.yml + - from-file: ./apps-gnome.yml diff --git a/config/recipe-latest.yml b/config/recipe-latest.yml index 79ceb2c..26441b8 100644 --- a/config/recipe-latest.yml +++ b/config/recipe-latest.yml @@ -1,13 +1,10 @@ -# image will be published to ghcr.io// name: universal-studio -# description will be included in the image's metadata -description: Operating system based on Fedora Silverblue meant for artists +description: Operating system based on Fedora Atomic meant for content creators and artists -# the base image to build on top of (FROM) and the version tag to use base-image: ghcr.io/ublue-os/kinoite-main -image-version: latest # latest is also supported if you want new updates ASAP +image-version: latest -# module configuration, executed in order -# you can include multiple instances of the same module modules: - from-file: ./apps.yml + - from-file: ./shared-sys.yml + - from-file: ./apps-plasma.yml diff --git a/config/recipe-nvidia.yml b/config/recipe-nvidia.yml index 3c8f820..98f434b 100644 --- a/config/recipe-nvidia.yml +++ b/config/recipe-nvidia.yml @@ -1,13 +1,10 @@ -# image will be published to ghcr.io// name: universal-studio-nvidia -# description will be included in the image's metadata -description: Operating system based on Fedora Silverblue meant for artists +description: Operating system based on Fedora Atomic meant for content creators and artists -# the base image to build on top of (FROM) and the version tag to use base-image: ghcr.io/ublue-os/kinoite-nvidia -image-version: latest # latest is also supported if you want new updates ASAP +image-version: latest -# module configuration, executed in order -# you can include multiple instances of the same module modules: - from-file: ./apps.yml + - from-file: ./shared-sys.yml + - from-file: ./apps-plasma.yml