manual rebase

.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

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 && \

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

cosign.pub

@@ -1,4 +1,4 @@
 -----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE7lh7fJMV4dBT2jT1XafixUJa7OVA
-cT+QFVD8IfIJIS/KBAc8hx1aslzkH3tfeM0cwyCLB7kOStZ4sh6RyFQD9w==
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEz+XNZtY2K17rapUcSQ5+rwxKOr/D
+AWE55K7g0eWAXQcJLKYF0v6jtcyyQc4iSFxDAcxACo4eUyzLSr8RUq93hg==
 -----END PUBLIC KEY-----

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",

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

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

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

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}"

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

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
+    }
+  }
+}