[pull] main from ublue-os:main (#24)

Co-authored-by: Dylan M. Taylor <dylan@dylanmtaylor.com>
Co-authored-by: Jorge O. Castro <jorge.castro@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Noel Miller <4983138+noelmiller@users.noreply.github.com>
Co-authored-by: Kyle Gospodnetich <me@kylegospodneti.ch>

.github/pull_request_template.md

@@ -0,0 +1,3 @@
+## Thank you for contributing to the Universal Blue project!
+
+Please [read the Contributor's Guide](https://universal-blue.org/CONTRIBUTING/) before submitting a pull request.

.github/workflows/build_iso.yml

@@ -0,0 +1,57 @@
+name: Build Bluefin ISOs
+on:
+  workflow_dispatch:
+env:
+  IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  build-iso:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+    container:
+      image: fedora:${{ matrix.major_version }}
+      options: "--privileged"
+      volumes:
+        - "/:/host"
+    strategy:
+      fail-fast: false
+      matrix:
+        image_name: [bluefin, bluefin-dx]
+        major_version: [38, 39]
+        image_tag: [latest,gts]
+        exclude:
+          - major_version: 38
+            image_tag: latest
+          - major_version: 39
+            image_tag: gts
+    steps:
+      - name: Build ISOs
+        #if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
+        uses: ublue-os/isogenerator@1.0.5
+        with:
+          ARCH: x86_64
+          IMAGE_NAME: ${{ matrix.image_name }}
+          IMAGE_REPO: ghcr.io/ublue-os
+          VARIANT: 'Silverblue'
+          VERSION: ${{ matrix.major_version }}
+          IMAGE_TAG: ${{ matrix.image_tag }}
+          ACTION_REPO: ublue-os/isogenerator
+          ACTION_REF: 1.0.5
+      - name: Upload ISOs and SHA Checksum Files to R2
+        shell: bash
+        run: |
+          export RCLONE_CONFIG_R2_TYPE=s3
+          export RCLONE_CONFIG_R2_PROVIDER=Cloudflare
+          export RCLONE_CONFIG_R2_ACCESS_KEY_ID=${{ secrets.R2_ACCESS_KEY_ID }}
+          export RCLONE_CONFIG_R2_SECRET_ACCESS_KEY=${{ secrets.R2_SECRET_ACCESS_KEY }}
+          export RCLONE_CONFIG_R2_REGION=auto
+          export RCLONE_CONFIG_R2_ENDPOINT=${{ secrets.R2_ENDPOINT }}
+          dnf install -y rclone
+          rclone copy ./end_iso R2:bluefin

.github/workflows/release-please.yml → .github/workflows/generate_changelog.yml

@@ -9,15 +9,11 @@ permissions:
   actions: read
   packages: write
   pull-requests: write
-      
-name: Release Please
+
+name: Generate Changelog
 jobs:
   release-please:
     runs-on: ubuntu-latest
-    outputs:
-      releases_created: ${{ steps.release-please.outputs.releases_created }}
-      tag: ${{ steps.release-please.outputs.tag_name }}
-      upload_url: ${{ steps.release-please.outputs.upload_url }}
     steps:
       - uses: google-github-actions/release-please-action@v4
         id: release-please

README.md

@@ -2,14 +2,20 @@
 
 **This image is considered Beta** 
 
-## [Download the test ISO](https://github.com/ublue-os/bluefin/releases/)
 ## [projectbluefin.io](https://projectbluefin.io)
 ## [Announcement Blog Post](https://www.ypsidanger.com/announcing-project-bluefin/)
+## Downloads
 
-A familiar(ish) Ubuntu desktop for Fedora Silverblue. It strives to cover these three use cases:
-- For end users it provides a system as reliable as a Chromebook with near-zero maintainance, with the power of Ubuntu and Fedora fused together
-- For developers we endeavour to provide the best cloud-native developer experience by enabling easy consumption of the [industry's leading tools](https://landscape.cncf.io/card-mode?sort=stars). These are included in dedicated `bluefin-dx` and `bluefin-dx-nvidia` images
-- For gamers we strive to deliver a world-class Flathub gaming experience
+### Bluefin
+
+A familiar(ish) Ubuntu desktop for Fedora Silverblue. It strives to cover these two use cases. For end users it provides a system as reliable as a Chromebook with near-zero maintainance, with the power of Ubuntu and Fedora fused together. For gamers we strive to deliver a world-class Flathub gaming experience.
+- [**bluefin-gts.iso**](https://download.projectbluefin.io/bluefin-gts.iso) - Recommended for new users (3.7GB, based on Fedora 38)
+- [**bluefin-latest.iso**](https://download.projectbluefin.io/bluefin-latest.iso) - Recommended for experienced users who are comfortable troubleshooting and contributing feedback to the project. (3.6GB, based on Fedora 39)
+
+### Bluefin Developer Experience Images
+For developers we endeavour to provide the best cloud-native developer experience by enabling easy consumption of the [industry's leading tools](https://landscape.cncf.io/card-mode?sort=stars). Check the [Bluefin-DX documentation](https://universal-blue.discourse.group/docs?topic=39) for more information.
+- [**bluefin-dx-gts**](https://download.projectbluefin.io/bluefin-dx-gts.iso) - Recommended for developers (4.7GB, based on Fedora 38)
+- [**bluefin-dx-latest**](https://download.projectbluefin.io/bluefin-dx-latest.iso) - Recommended for developers who are comfortable troubleshooting and contributing feedback to the project. (4.6GB, based on Fedora 39)
 
 ![image](https://github.com/ublue-os/bluefin/assets/1264109/c0b3fa8a-f513-4bb1-b314-e134d1802e18)
 

just/custom.just

@@ -124,30 +124,6 @@ jetbrains-toolbox:
     echo "Launching JetBrains Toolbox"
     ./jetbrains-toolbox-"${BUILD_VERSION}"/jetbrains-toolbox
 
-# Install garden.io, the Cloud Native DevOps automation platform | https://garden.io
-garden:
-    #!/usr/bin/env bash
-    if ! command -v garden &> /dev/null; then
-        ASSET_URL=$(curl -s https://api.github.com/repos/garden-io/garden/releases/latest | \
-            jq -r '.assets[] | select(.browser_download_url | test("linux-amd64.tar.gz$")) | .browser_download_url')
-        GARDEN_DIR="${HOME}/.garden/bin"
-        TMP_DIR=$(mktemp -d)
-        curl -sSL "$ASSET_URL" | tar -xz -C "$TMP_DIR"
-        mkdir -p "$GARDEN_DIR"
-        mv "$TMP_DIR"/linux-amd64/garden "$GARDEN_DIR"
-        rm -rf "$TMP_DIR"
-
-        echo ""
-        echo "🌺🌻  Garden has been successfully installed 🌷💐"
-        echo ""
-        echo "Add the Garden CLI to your path by adding the following to your .bashrc/.zshrc:"
-        echo ""
-        echo "  export PATH=\$PATH:\$HOME/.garden/bin"
-        echo ""
-        echo "Head over to our documentation for next steps: https://docs.garden.io"
-        echo ""
-    fi
-
 # Install and configure Incus
 incus:
     #!/usr/bin/env bash
@@ -163,27 +139,6 @@ incus:
         exit
     fi
 
-# Install nix and Devbox
-nix-devbox:
-    echo 'Setting phasers to kill. Installing nix.'
-    curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
-    echo 'Installing devbox!'
-    curl -fsSL https://get.jetpack.io/devbox | bash
-    echo 'You MUST reboot to continue'
-
-# Remove nix
-nix-remove:
-    echo 'Setting phasers to stun. Removing nix.'
-    /nix/nix-installer uninstall
-
-# Install nix and Devbox (Global Profile)
-nix-devbox-global:
-    echo 'Installing devbox global profile.'
-    devbox global pull https://devbox.getfleek.dev/high
-    echo 'run "devbox global run install-hook-bash" to configure bash shell'
-    echo 'run "devbox global run install-hook-zsh" to configure zsh shell'
-    echo 'run "devbox global run" to see other available configuration commands'
-
 # Ptyxis terminal transparency
 ptyxis-transparency opacity="0.95":
     #!/usr/bin/env bash
@@ -222,11 +177,6 @@ touch:
     gext install improvedosk@nick-shmyrev.dev
     gext install gestureImprovements@gestures
 
-# Upgrade Distrobox to the latest git version
-distrobox-git:
-    echo 'Installing latest git snapshot of Distrobox'
-    curl -s https://raw.githubusercontent.com/89luca89/distrobox/main/install | sh -s -- --next --prefix ~/.local
-
 # Run the yafti setup tool
 yafti:
     yafti /etc/yafti.yml --force

packages.json

@@ -29,6 +29,8 @@
 				"playerctl",
 				"pulseaudio-utils",
 				"python3-pip",
+				"rclone",
+				"restic",
 				"samba-dcerpc",
 				"samba-ldb-ldap-modules",
 				"samba-winbind-clients",

usr/etc/dconf/db/local.d/01-ublue

@@ -57,12 +57,12 @@ min-alpha=0.5
 
 [org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0]
 binding='<Control><Alt>t'
-command='ptyxis --tab-with-profile=2871e8027773ae74d6c87a5f659bbc74'
+command='ptyxis --tab-with-profile=2871e8027773ae74d6c87a5f659bbc74 --new-window'
 name='Host Ptyxis'
 
 [org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1]
 binding='<Control><Alt>u'
-command='ptyxis --tab-with-profile=4741cb2eb3614750b79edc5c4b8c08b3'
+command='ptyxis --tab-with-profile=4741cb2eb3614750b79edc5c4b8c08b3 --new-window'
 name='Ubuntu Ptyxis'
 
 [org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2]
@@ -72,12 +72,12 @@ name='mission-center'
 
 [org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom3]
 binding='<Control><Alt>Return'
-command="ptyxis --tab-with-profile=a21a910811504857bea4c96b3d937b93"
+command="ptyxis --tab-with-profile=a21a910811504857bea4c96b3d937b93 --new-window"
 name='Bluefin Ptyxis'
 
 [org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom4]
 binding='<Control><Alt>f'
-command="ptyxis --tab-with-profile=d6fe45489ed74fada5d95d715449ce7e"
+command="ptyxis --tab-with-profile=d6fe45489ed74fada5d95d715449ce7e --new-window"
 name='Fedora Ptyxis'
 
 [org/gnome/settings-daemon/plugins/media-keys]