Merge pull request #110 from tulilirockz/ujust-integration

feat: integrate uupd and install-system-flatpaks into ujust

README.md

@@ -16,7 +16,7 @@ This is not a 1:1 recreation, it's a minimal product, see below for more informa
 ### Installation and Caveats
 
 1. Snag the ISO: [download.projectbluefin.io/achillobator.iso](https://download.projectbluefin.io/achillobator.iso)
-2. On first boot, install flatpaks: `just install-system-flatpaks`
+2. On first boot, install flatpaks: `ujust install-system-flatpaks`
 
 [Incoming anaconda PR](https://github.com/rhinstaller/anaconda/pull/6056) for the flatpaks, also:
 

system_files/usr/share/ublue-os/just/10-update.just

@@ -2,12 +2,8 @@
 
 alias upgrade := update
 
-# Update system, flatpaks, and containers all at once
 update:
-    #!/usr/bin/bash
-    TOPGRADE_CONFIG="/usr/share/ublue-os/topgrade"
-    /usr/bin/grep "^LockLayering=true" /etc/rpm-ostreed.conf &>/dev/null && TOPGRADE_CONFIG="${TOPGRADE_CONFIG}-bootc"
-    /usr/bin/topgrade --config "${TOPGRADE_CONFIG}.toml" --keep
+    pkexec uupd --log-level debug
 
 alias auto-update := toggle-updates
 

system_files/etc/skel/Justfile → system_files/usr/share/ublue-os/just/60-custom.just

@@ -1,11 +1,9 @@
-[private]
-default:
-    @just --choose
-
 install-system-flatpaks:
     #!/usr/bin/env bash
     if ! flatpak remotes | grep -q flathub; then
         flatpak remote-add --system flathub https://flathub.org/repo/flathub.flatpakrepo
     fi
     flatpak --system -y install --or-update $(curl -s https://raw.githubusercontent.com/ublue-os/bluefin/main/bluefin_flatpaks/flatpaks | tr '\n' ' ')
 
+bluefin-cli:
+    /usr/libexec/ublue-bling

system_files/usr/share/ublue-os/motd/template.md

@@ -9,7 +9,7 @@
 | `ujust bluefin-cli` | Enable terminal bling | 
 | `brew help` | Manage command line packages | 
 
-NOTE: Use `just install-system-flatpaks` to finish the installation
+NOTE: Use `ujust install-system-flatpaks` to finish the installation
 
 - **󰊤** [Issues](https://issues.projectbluefin.io)
 - **󰈙** [Documentation](http://docs.projectbluefin.io/)

system_files/usr/share/ublue-os/user-setup.hooks.d/10-theming.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -x
 VEN_ID="$(cat /sys/devices/virtual/dmi/id/chassis_vendor)"
 
 # Ensure custom ptyxis theme is present