diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08fcd17..0e38af2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,13 +2,12 @@ name: bluebuild on: schedule: - cron: "00 17 * * *" # build at 17:00 UTC every day - # (20 minutes after last ublue images start building) push: - paths-ignore: # don't rebuild if only documentation has changed + paths-ignore: - "**.md" pull_request: - workflow_dispatch: # allow manually triggering builds + workflow_dispatch: jobs: bluebuild: name: Build Custom Image @@ -18,16 +17,14 @@ jobs: packages: write id-token: write strategy: - fail-fast: false # stop GH from cancelling all matrix builds if one fails + fail-fast: false matrix: recipe: - # !! Add your recipes here - - recipe-latest.yml + - recipe.yml - recipe-nvidia.yml - recipe-gnome.yml - recipe-gnome-nvidia.yml steps: - # the build is fully handled by the reusable github action - name: Build Custom Image uses: blue-build/github-action@v1.1 with: diff --git a/README.md b/README.md index 567ecde..66ec81f 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@
- drawing -

Universal Studio

+ drawing +

Atomic Studio

-Want Ubuntu Studio but in a reproducible and atomic environment? Then Universal Studio is for you! We provide all the same packages that you would get with Ubuntu Studio, but in a stable, atomic and reliable for all your content creation needs. +Want Ubuntu Studio but in a reproducible and atomic environment? Then Atomic Studio is for you! We provide all the same packages that you would get with Ubuntu Studio, but in a stable, atomic and reliable for all your content creation needs. -This image is distributed in two flavours: Plasma and Gnome, they have the same applications, but some minor differentes in theming, and some adapted aplications for better system integration (like `qpwgraph` <-> `helvum`). You can install this image by either installing the Offline ISO in [Releases](https://github.com/tulilirockz/Universal-Studio/releases) or by rebasing your system to one of them. +This image is distributed in two flavours: Plasma and Gnome, they have the same applications, but some minor differentes in theming, and some adapted aplications for better system integration (like `qpwgraph` <-> `helvum`). You can install this image by either installing the Offline ISO in [Releases](https://github.com/tulilirockz/Atomic-Studio/releases) or by rebasing your system to one of them. > This operating system image is not affilitated with Ubuntu or Fedora at all! We just use the Fedora base and get some inspirations from the Ubuntu Studio project. If you like this project, make sure to check out Ubuntu Studio proper! @@ -15,7 +15,7 @@ To rebase an existing atomic Fedora installation to the latest build: - First rebase to the unsigned image, to get the proper signing keys and policies installed: ``` - rpm-ostree rebase ostree-unverified-registry:ghcr.io/tulilirockz/universal-studio:latest + rpm-ostree rebase ostree-unverified-registry:ghcr.io/tulilirockz/atomic-studio:latest ``` - Reboot to complete the rebase: ``` @@ -23,7 +23,7 @@ To rebase an existing atomic Fedora installation to the latest build: ``` - Then rebase to the signed image, like so: ``` - rpm-ostree rebase ostree-image-signed:docker://ghcr.io/tulilirockz/universal-studio:latest + rpm-ostree rebase ostree-image-signed:docker://ghcr.io/tulilirockz/atomic-studio:latest ``` - Reboot again to complete the installation ``` @@ -34,22 +34,22 @@ To rebase an existing atomic Fedora installation to the latest build: ```shell # Latest Plasma version -rpm-ostree rebase ostree-image-signed:docker://ghcr.io/tulilirockz/universal-studio:latest +rpm-ostree rebase ostree-image-signed:docker://ghcr.io/tulilirockz/atomic-studio:latest # Latest Plasma version + Nvidia -rpm-ostree rebase ostree-image-signed:docker://ghcr.io/tulilirockz/universal-studio-nvidia:latest +rpm-ostree rebase ostree-image-signed:docker://ghcr.io/tulilirockz/atomic-studio-nvidia:latest # Latest Gnome version -rpm-ostree rebase ostree-image-signed:docker://ghcr.io/tulilirockz/universal-studio-gnome:latest +rpm-ostree rebase ostree-image-signed:docker://ghcr.io/tulilirockz/atomic-studio-gnome:latest # Latest Gnome version + Nvidia -rpm-ostree rebase ostree-image-signed:docker://ghcr.io/tulilirockz/universal-studio-gnome-nvidia:latest +rpm-ostree rebase ostree-image-signed:docker://ghcr.io/tulilirockz/atomic-studio-gnome-nvidia:latest ``` > Note: If these commands do not work first time, you are probably on a vanilla Fedora Atomic system, please run these but, instead of `ostree-image-signed:docker://`, use `ostree-unverified-registry:`, like the follwing command: >```shell ># Unsigned version, please refrain from using this! - Only rebase to this first, then rebase to a signed image if you arent on a Universal Blue system ->rpm-ostree rebase ostree-unverified-registry:ghcr.io/tulilirockz/universal-studio:latest +>rpm-ostree rebase ostree-unverified-registry:ghcr.io/tulilirockz/atomic-studio:latest >``` diff --git a/boot_menu.yml b/boot_menu.yml index d40b61a..92c5d0d 100644 --- a/boot_menu.yml +++ b/boot_menu.yml @@ -1,5 +1,5 @@ ublue_variants: - - label: tulilirockz/universal-studio + - label: tulilirockz/atomic-studio ks: /kickstart/ublue-os.ks flavors: - - label: Universal Studio + - label: Atomic Studio diff --git a/config/recipe-gnome-nvidia.yml b/config/recipe-gnome-nvidia.yml index 5764009..1679b42 100644 --- a/config/recipe-gnome-nvidia.yml +++ b/config/recipe-gnome-nvidia.yml @@ -1,10 +1,10 @@ -name: universal-studio-gnome-nvidia +name: atomic-studio-gnome-nvidia description: Operating system based on Fedora Atomic meant for content creators and artists base-image: ghcr.io/ublue-os/silverblue-nvidia image-version: latest modules: - - from-file: ./apps.yml - - from-file: ./shared-sys.yml - - from-file: ./apps-gnome.yml \ No newline at end of file + - from-file: ./common/apps.yml + - from-file: ./common/shared-sys.yml + - from-file: ./common/apps-gnome.yml diff --git a/config/recipe-gnome.yml b/config/recipe-gnome.yml index cfbb442..807bfb7 100644 --- a/config/recipe-gnome.yml +++ b/config/recipe-gnome.yml @@ -1,10 +1,10 @@ -name: universal-studio-gnome +name: atomic-studio-gnome description: Operating system based on Fedora Atomic meant for content creators and artists base-image: ghcr.io/ublue-os/silverblue-main image-version: latest modules: - - from-file: ./apps.yml - - from-file: ./shared-sys.yml - - from-file: ./apps-gnome.yml + - from-file: ./common/apps.yml + - from-file: ./common/shared-sys.yml + - from-file: ./common/apps-gnome.yml diff --git a/config/recipe-nvidia.yml b/config/recipe-nvidia.yml index 98f434b..9376e60 100644 --- a/config/recipe-nvidia.yml +++ b/config/recipe-nvidia.yml @@ -1,10 +1,10 @@ -name: universal-studio-nvidia +name: atomic-studio-nvidia description: Operating system based on Fedora Atomic meant for content creators and artists base-image: ghcr.io/ublue-os/kinoite-nvidia image-version: latest modules: - - from-file: ./apps.yml - - from-file: ./shared-sys.yml - - from-file: ./apps-plasma.yml + - from-file: ./common/apps.yml + - from-file: ./common/shared-sys.yml + - from-file: ./common/apps-plasma.yml diff --git a/config/recipe-latest.yml b/config/recipe.yml similarity index 55% rename from config/recipe-latest.yml rename to config/recipe.yml index 26441b8..c8526da 100644 --- a/config/recipe-latest.yml +++ b/config/recipe.yml @@ -1,10 +1,10 @@ -name: universal-studio +name: atomic-studio description: Operating system based on Fedora Atomic meant for content creators and artists base-image: ghcr.io/ublue-os/kinoite-main image-version: latest modules: - - from-file: ./apps.yml - - from-file: ./shared-sys.yml - - from-file: ./apps-plasma.yml + - from-file: ./common/apps.yml + - from-file: ./common/shared-sys.yml + - from-file: ./common/apps-plasma.yml