diff --git a/.github/workflows/publish-iso.yml b/.github/workflows/publish-iso.yml index d4654816a1..3a138055c2 100644 --- a/.github/workflows/publish-iso.yml +++ b/.github/workflows/publish-iso.yml @@ -1,7 +1,7 @@ on: workflow_dispatch: -name: release-iso +name: publish-iso jobs: release-iso: name: Generate and Release ISOs diff --git a/boot_menu.yml b/boot_menu.yml index e08c33da09..d44708ffef 100644 --- a/boot_menu.yml +++ b/boot_menu.yml @@ -54,4 +54,6 @@ ublue_variants: - label: malachite info: Malachite - label: malachine-nvidia - info: Malachive Nvidia builds + info: Malachive Nvidia builds + - label: malachine-dx + info: Malachive Development Builds diff --git a/recipe-nvidia.yml b/recipe-nvidia.yml index aad531cfe4..5cda14fd5f 100644 --- a/recipe-nvidia.yml +++ b/recipe-nvidia.yml @@ -48,7 +48,6 @@ rpm: repos: # Example (which also demonstrates version number expansion): # - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%FEDORA_VERSION%/atim-starship-fedora-%FEDORA_VERSION%.repo - - https://terra.fyralabs.com/terra.repo # These RPMs will be installed from your enabled repositories (Fedora's own # repos, extra "repos" you've added, etc). The installation is automatically @@ -75,10 +74,6 @@ rpm: - cockpit-navigator - cockpit-file-sharing - tailscale - - fish - - ubuntumono-nerd-fonts - - ubuntu-nerd-fonts - # These RPMs will be removed from the system image. This step happens during # image build, BEFORE installing custom RPMs (from the "rpm.install" category). remove: @@ -91,18 +86,4 @@ rpm: # Configuration for the "first boot" experience, which is available after login. firstboot: - # Whether to embed "yafti" into the OS image and configure it to autostart, - # which is the preferred uBlue "first boot" GUI. Set this to "false" if you've - # decided to use a different solution instead. yafti: true - - # These Flatpaks will be suggested for install after user login, via the yafti - # "first boot" GUI. Everything below will be merged into the "yafti.yml" config - # on build, in a category named "Custom". If you prefer, you can instead remove - # everything below and directly edit "yafti.yml" to have more control. - # Alternatively, if you've disabled "yafti", you can still install these via - # the "just setup-flatpaks" command from our "custom.just" template file. - # This is just an example selection: - flatpaks: - - io.github.celluloid_player.Celluloid - - org.kde.krita diff --git a/recipe.yml b/recipe.yml index fe800ae6f4..117c2044eb 100644 --- a/recipe.yml +++ b/recipe.yml @@ -47,8 +47,7 @@ rpm: # which greatly simplifies future maintenance of your custom recipe. repos: # Example (which also demonstrates version number expansion): - - https://terra.fyralabs.com/terra.repo - + - https://copr.fedorainfracloud.org/coprs/atim/nushell/repo/fedora-%FEDORA_VERSION%/atim-nushell-fedora-%FEDORA_VERSION%.repo # These RPMs will be installed from your enabled repositories (Fedora's own # repos, extra "repos" you've added, etc). The installation is automatically # performed via rpm-ostree during the image build, and will be pre-installed @@ -74,7 +73,7 @@ rpm: - fish - waydroid - gnome-shell-extension-gsconnect - + - nushell # These RPMs will be removed from the system image. This step happens during # image build, BEFORE installing custom RPMs (from the "rpm.install" category). remove: @@ -88,20 +87,5 @@ rpm: - nvtop - gnome-tour -# Configuration for the "first boot" experience, which is available after login. firstboot: - # Whether to embed "yafti" into the OS image and configure it to autostart, - # which is the preferred uBlue "first boot" GUI. Set this to "false" if you've - # decided to use a different solution instead. yafti: true - - # These Flatpaks will be suggested for install after user login, via the yafti - # "first boot" GUI. Everything below will be merged into the "yafti.yml" config - # on build, in a category named "Custom". If you prefer, you can instead remove - # everything below and directly edit "yafti.yml" to have more control. - # Alternatively, if you've disabled "yafti", you can still install these via - # the "just setup-flatpaks" command from our "custom.just" template file. - # This is just an example selection: - flatpaks: - - io.github.celluloid_player.Celluloid - - org.kde.krita diff --git a/scripts/autorun.sh b/scripts/autorun.sh old mode 100644 new mode 100755 diff --git a/scripts/build.sh b/scripts/build.sh old mode 100644 new mode 100755 index c5d43fffbf..5ffda2d3c0 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -88,23 +88,6 @@ else rm -rf "${FIRSTBOOT_DATA}" fi -# Add a new yafti "package group" called Custom, for the packages defined in recipe.yml. -# Only adds the package group if yafti is enabled and Flatpaks are defined in the recipe. -if [[ "${YAFTI_ENABLED}" == "true" ]]; then - YAFTI_FILE="${FIRSTBOOT_DATA}/yafti.yml" - get_yaml_array flatpaks '.firstboot.flatpaks[]' - if [[ ${#flatpaks[@]} -gt 0 ]]; then - echo "-- yafti: Adding Flatpaks defined in recipe.yml --" - yq -i '.screens.applications.values.groups.Custom.description = "Flatpaks suggested by the image maintainer."' "${YAFTI_FILE}" - yq -i '.screens.applications.values.groups.Custom.default = true' "${YAFTI_FILE}" - for pkg in "${flatpaks[@]}"; do - echo "Adding to yafti: ${pkg}" - yq -i ".screens.applications.values.groups.Custom.packages += [{\"${pkg}\": \"${pkg}\"}]" "${YAFTI_FILE}" - done - echo "---" - fi -fi - # Setup container signing echo "Setup container signing in policy.json and cosign.yaml" echo "Registry to write: $IMAGE_REGISTRY" diff --git a/scripts/post/99-bash_umask.sh b/scripts/post/99-bash_umask.sh old mode 100644 new mode 100755 diff --git a/scripts/post/hardening.sh b/scripts/post/hardening.sh old mode 100644 new mode 100755 diff --git a/usr/etc/update.d/99-boxes.sh b/usr/etc/update.d/99-boxes.sh old mode 100644 new mode 100755 diff --git a/usr/share/ublue-os/firstboot/launcher/login-profile.sh b/usr/share/ublue-os/firstboot/launcher/login-profile.sh old mode 100644 new mode 100755