From c697911989356f5d1acacdb1f61268f20db19ccb Mon Sep 17 00:00:00 2001 From: bri <284789+b-@users.noreply.github.com> Date: Mon, 27 Nov 2023 19:19:36 -0500 Subject: [PATCH] manual rebase --- .github/workflows/build.yml | 9 ++++- Containerfile | 26 +++++++++++++++ README.md | 10 +++--- cosign.pub | 4 +-- packages.json | 14 +++++--- scripts/bat.sh | 35 ++++++++++++++++++++ scripts/delta.sh | 20 +++++++++++ scripts/more.sh | 4 +++ scripts/pragmatapro.sh | 12 +++++++ usr/etc/flatpak/user/install | 1 - usr/lib64/firefox/distribution/policies.json | 13 ++++++++ 11 files changed, 135 insertions(+), 13 deletions(-) create mode 100755 scripts/bat.sh create mode 100755 scripts/delta.sh create mode 100755 scripts/more.sh create mode 100644 scripts/pragmatapro.sh create mode 100644 usr/lib64/firefox/distribution/policies.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b366390dfb0..67348b7ff75 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: merge_group: pull_request: branches: - - main + - live paths-ignore: - '**.md' workflow_dispatch: @@ -128,6 +128,13 @@ jobs: io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ublue-os/bluefin/bluefin/README.md io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/120078124?s=200&v=4 + - name: Get Pragmata Pro zip file + run: | + curl "$(curl -q \ + 'https://ckdatabasews.icloud.com/database/1/com.apple.cloudkit/production/public/records/resolve' \ + --data-raw '{"shortGUIDs":[{"value":"${{ secrets.PRAGMATAPRO_ICLOUD_ID }}"}]}' --compressed | \ + jq -r '.results[0].rootRecord.fields.fileContent.value.downloadURL')" -L > /tmp/pragmatapro.zip + # Build image using Buildah action - name: Build Image id: build_image diff --git a/Containerfile b/Containerfile index 688a8fad77a..d6fc7b9e10e 100644 --- a/Containerfile +++ b/Containerfile @@ -155,6 +155,32 @@ RUN systemctl enable podman.socket && \ RUN /tmp/workarounds.sh +### BEGIN bri +# Add custom scripts +ADD --chmod=0755 scripts/* /tmp/ + +### add bat +RUN /tmp/bat.sh + +### add delta +RUN /tmp/delta.sh + +### add 1password +COPY --from=ghcr.io/ublue-os/bling:latest /modules/bling/installers/1password.sh /tmp/1password.sh +RUN chmod +x /tmp/1password.sh && \ + ONEPASSWORD_RELEASE_CHANNEL=beta \ + GID_ONEPASSWORD=1500 \ + GID_ONEPASSWORDCLI=1600 \ + /tmp/1password.sh + +### add appimagelauncher +RUN rpm-ostree install "https://github.com/TheAssassin/AppImageLauncher/releases/download/continuous/appimagelauncher-2.2.0-gha111.d9d4c73.x86_64.rpm" + +### more +RUN /tmp/more.sh + +### END bri + # Clean up repos, everything is on the image so we don't need them RUN rm -f /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ rm -f /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ diff --git a/README.md b/README.md index 4992f7da96c..79f5e43102b 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# bluefin +# bri's bluefin spin -**This image is considered Beta** +**a personal fork of Universal Blue's Bluefin{,-DX} spin on Fedora Silverblue** -## [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/) +[![Bluefin Build](https://github.com/ublue-os/bluefin/actions/workflows/build.yml/badge.svg)](https://github.com/ublue-os/bluefin/actions/workflows/build.yml) + +[![Ubuntu Toolbox Build](https://github.com/ublue-os/bluefin/actions/workflows/build-ubuntu-toolbox.yml/badge.svg)](https://github.com/ublue-os/bluefin/actions/workflows/build-ubuntu-toolbox.yml) 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 diff --git a/cosign.pub b/cosign.pub index f9482c42af9..eb884d96c8a 100644 --- a/cosign.pub +++ b/cosign.pub @@ -1,4 +1,4 @@ -----BEGIN PUBLIC KEY----- -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE7lh7fJMV4dBT2jT1XafixUJa7OVA -cT+QFVD8IfIJIS/KBAc8hx1aslzkH3tfeM0cwyCLB7kOStZ4sh6RyFQD9w== +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEz+XNZtY2K17rapUcSQ5+rwxKOr/D +AWE55K7g0eWAXQcJLKYF0v6jtcyyQc4iSFxDAcxACo4eUyzLSr8RUq93hg== -----END PUBLIC KEY----- diff --git a/packages.json b/packages.json index ad1bbdd5f3f..7a7e8d4bb0b 100644 --- a/packages.json +++ b/packages.json @@ -2,17 +2,23 @@ "all": { "include": { "bluefin": [ + "chromium", "fedora-chromium-config", "fedora-chromium-config-gnome", "fedora-chromium-config-gssapi", "bash-color-prompt", "cockpit-bridge", + "ddccontrol-db", + "ddccontrol-gtk", + "ddccontrol", "evtest", "fish", + "freerdp", + "gdisk", "glow", - "gum", "gnome-shell-extension-appindicator", "gnome-shell-extension-blur-my-shell", "gnome-shell-extension-dash-to-dock", "gnome-shell-extension-gsconnect", "gnome-shell-extension-tailscale-status", + "gum", "hplip", "input-remapper", "libgda-sqlite", @@ -21,6 +27,7 @@ "libxcrypt-compat", "mesa-libGLU", "nautilus-gsconnect", + "neovim", "neovim-qt", "pulseaudio-utils", "python3-pip", "samba-dcerpc", @@ -115,13 +122,12 @@ "systemtap", "ubuntu-nerd-fonts", "ubuntumono-nerd-fonts", - "virt-manager" + "virt-manager", + "virt-viewer" ] }, "exclude": { "bluefin": [ - "firefox-langpacks", - "firefox", "gnome-extensions-app", "gnome-software-rpm-ostree", "gnome-tour", diff --git a/scripts/bat.sh b/scripts/bat.sh new file mode 100755 index 00000000000..0f34b5e3594 --- /dev/null +++ b/scripts/bat.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env sh + +set -e + +echo "Installing Bat" + +cd "$(mktemp -d)" + +wget -q https://github.com/sharkdp/bat/releases/download/v0.23.0/bat-v0.23.0-x86_64-unknown-linux-musl.tar.gz + +tar --strip-components=1 -xf bat-v0.23.0-x86_64-unknown-linux-musl.tar.gz + +mkdir -p /usr/share/bash-completion/completions +mkdir -p /usr/share/fish/vendor_completions.d/ +mkdir -p /usr/share/zsh/vendor-completions/ + +mv autocomplete/bat.bash /usr/share/bash-completion/completions/bat +mv autocomplete/bat.fish /usr/share/fish/vendor_completions.d/bat.fish +mv autocomplete/bat.zsh /usr/share/zsh/vendor-completions/_bat + +mkdir -p /usr/share/doc/bat-musl + +mv CHANGELOG.md /usr/share/doc/bat-musl/ +mv LICENSE-APACHE /usr/share/doc/bat-musl/ +mv LICENSE-MIT /usr/share/doc/bat-musl/ +mv README.md /usr/share/doc/bat-musl/ + +gzip -c bat.1 > /usr/share/man/man1/bat.1.gz + +mv bat /usr/bin/bat + +#rm /usr/bin/cat +#ln /usr/bin/bat /usr/bin/cat +# +#cat --version diff --git a/scripts/delta.sh b/scripts/delta.sh new file mode 100755 index 00000000000..7d7eb97cbd2 --- /dev/null +++ b/scripts/delta.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env sh + +set -e + +echo "Installing Delta" + +cd "$(mktemp -d)" + +wget -q https://github.com/dandavison/delta/releases/download/0.15.1/delta-0.15.1-x86_64-unknown-linux-musl.tar.gz + +tar --strip-components=1 -xf delta-0.15.1-x86_64-unknown-linux-musl.tar.gz + +mkdir -p /usr/share/doc/delta-musl + +mv LICENSE /usr/share/doc/delta-musl/ +mv README.md /usr/share/doc/delta-musl/ + +mv delta /usr/bin/delta + +delta --version diff --git a/scripts/more.sh b/scripts/more.sh new file mode 100755 index 00000000000..c8dbff82af5 --- /dev/null +++ b/scripts/more.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +wget 'https://github.com/neovim/neovim/releases/download/nightly/nvim.appimage' -Lo /usr/bin/nvim.appimage +#wget 'https://download.beeper.com/linux/appImage/x64' -Lo /usr/bin/beeper.appimage diff --git a/scripts/pragmatapro.sh b/scripts/pragmatapro.sh new file mode 100644 index 00000000000..f47ca609fed --- /dev/null +++ b/scripts/pragmatapro.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# This font is not free or open-source, so I'm hiding the script to download the zip in gh secrets. +# Sorry... I don't want to get in trouble. +# +# To run this locally, you should have a /tmp/pragmatapro.zip + +set -euxo pipefail + +mkdir /usr/share/fonts/pragmatapro -p +cd /usr/share/fonts/pragmatapro +unzip /tmp/pragmatapro.zip +fc-cache -f "${PWD}" \ No newline at end of file diff --git a/usr/etc/flatpak/user/install b/usr/etc/flatpak/user/install index 31c93a60b86..3194475379b 100644 --- a/usr/etc/flatpak/user/install +++ b/usr/etc/flatpak/user/install @@ -1,4 +1,3 @@ -org.mozilla.firefox org.freedesktop.Platform.ffmpeg-full//22.08 com.raggesilver.BlackBox org.gnome.Calculator diff --git a/usr/lib64/firefox/distribution/policies.json b/usr/lib64/firefox/distribution/policies.json new file mode 100644 index 00000000000..2346bb66251 --- /dev/null +++ b/usr/lib64/firefox/distribution/policies.json @@ -0,0 +1,13 @@ +{ + "policies": { + "DisablePocket": true, + "FirefoxHome": { + "SponsoredTopSites": false, + "Highlights": false, + "Pocket": false, + "SponsoredPocket": false, + "Snippets": false, + "Locked": false + } + } +} \ No newline at end of file