feat: use ublue udev rules and ujust

Author: ledif

containerfiles/ublue/Containerfile

@@ -0,0 +1,11 @@
+RUN rpm-ostree install just powerstat
+COPY --from=ghcr.io/ublue-os/config:latest /rpms/ublue-os-udev-rules.noarch.rpm /
+COPY --from=ghcr.io/ublue-os/config:latest /rpms/ublue-os-update-services.noarch.rpm /
+COPY --from=ghcr.io/ublue-os/config:latest /rpms/ublue-os-signing.noarch.rpm /
+COPY --from=ghcr.io/ublue-os/config:latest /rpms/ublue-os-luks.noarch.rpm /
+COPY --from=ghcr.io/ublue-os/config:latest /rpms/ublue-os-just.noarch.rpm /
+RUN rpm -ivh /ublue-os-udev-rules.noarch.rpm
+RUN rpm -ivh /ublue-os-update-services.noarch.rpm
+RUN rpm -ivh /ublue-os-signing.noarch.rpm
+RUN rpm -ivh /ublue-os-luks.noarch.rpm
+RUN rpm -ivh /ublue-os-just.noarch.rpm

files/scripts/00-image-info.sh

@@ -12,7 +12,7 @@ SUPPORT_URL="https://github.com/ledif/blue95/issues/"
 BUG_SUPPORT_URL="https://github.com/ledif/blue95/issues"
 VERSION_CODENAME="Ross"
 
-IMAGE_INFO="/usr/share/blue95/image-info.json"
+IMAGE_INFO="/usr/share/ublue-os/image-info.json"
 IMAGE_REF="ostree-image-signed:docker://ghcr.io/$IMAGE_VENDOR/$IMAGE_NAME"
 
 FEDORA_MAJOR_VERSION=41

files/scripts/20-chicago95.sh

@@ -10,14 +10,26 @@ mv Chicago95* /usr/src/chicago95
 cd /usr/src/chicago95
 
 # Themes
-mkdir -p /usr/share/blue95/themes
-cp -r Theme/Chicago95 /usr/share/blue95/themes
-ln -s /usr/share/blue95/themes/Chicago95 /usr/share/themes/Chicago95
-flatpak override --filesystem=/usr/share/blue95/themes/
-flatpak override --env=GTK_THEME=Chicago95
+cp -r Theme/Chicago95 /usr/share/themes
+#flatpak override --filesystem=/usr/share/blue95/themes/
+#flatpak override --env=GTK_THEME=Chicago95
 
 # Icons and cursors
 cp -r Icons/* Cursors/* /usr/share/icons/
+
+# Battery tweaks (stay on full icon from 100%-90%)
+for f in $(find . -name "battery-level-90*"); do
+  target=$(echo ${f/90/100} | sed 's/-charging//')
+  rm $f
+  ln -s $target $f
+done
+
+
+# Custom app icons
+
+ln -s /usr/share/icons/Chicago95/apps/48/{software,bauh}.png
+ln -s /usr/share/icons/Chicago95/apps/48/stock_keyring.png /usr/share/icons/Chicago95/apps/com.onepassword.OnePassword.png
+
 update-mime-database /usr/share/mime
 gdk-pixbuf-query-loaders-64 --update-cache
 

files/scripts/21-fix-icon-sizes.py

@@ -37,11 +37,13 @@
     if not size_dir.is_dir():
         size_dir.mkdir()
 
+    num_created = 0
     for icon in icons_for_all_sizes:
       out_png = size_dir / icon
       in_svg = Path(category_dir / "scalable" / f"{Path(icon).stem}.svg")
 
       if not out_png.exists() and in_svg.exists():
-        print(f"-- Creating {out_png}")
         cairosvg.svg2png(url=str(in_svg), write_to=str(out_png), output_width=int(size), output_height=int(size))
+        num_created = num_created + 1
 
+    print(f"-- Created {num_created} icons for {category_dir.name} ({size}px)")

files/scripts/29-finalize-de-tweaks.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ouex pipefail
+
+update-mime-database /usr/share/mime
+gdk-pixbuf-query-loaders-64 --update-cache

files/system/usr/share/applications/bauh.desktop

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Software Store
+Categories=System;
+Comment=Install and manage Flatpak applications
+Exec=/usr/bin/bauh
+Icon=system-software-installer

files/system/usr/share/blue95/blue95-logo.ansi files/system/usr/share/ublue-os/blue95-logo.ansi

@@ -2,7 +2,7 @@
   "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
   "logo": {
     "type": "file",
-    "source": "/usr/share/blue95/blue95-logo.ansi",
+    "source": "/usr/share/ublue-os/blue95-logo.ansi",
     "color": {
         "1": "94",
         "2": "95",

files/system/usr/share/blue95/fastfetch.jsonc files/system/usr/share/ublue-os/fastfetch.jsonc

@@ -0,0 +1,24 @@
+alias brew := install-brew
+
+# Install Homebrew | https://brew.sh
+install-brew:
+    #!/usr/bin/env bash
+    source /usr/lib/ujust/ujust.sh
+    if [[ ! -f "/var/home/linuxbrew/.linuxbrew/bin" || ! -x "/var/home/linuxbrew/.linuxbrew/bin/brew" ]]; then
+        echo "${b}Brew Installation${n}"
+        echo "Please ${b}IGNORE${n} everything the installer tells you to do at the end"
+        echo "We have already done it for you! You just need to close and re-open the terminal after installation"
+        echo "Do you understand?"
+        echo "Please type in \"YES I UNDERSTAND\" and press enter"
+        read ACCEPT
+        if [ "$ACCEPT" == "YES I UNDERSTAND" ]; then
+          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+        else
+          echo "Capitalization matters when you type \"YES I UNDERSTAND\""
+        fi
+    fi
+    
+# Removes homebrew from system
+remove-brew:
+    echo "Removing homebrew ..."
+    /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/uninstall.sh)"

files/system/usr/share/ublue-os/just/50-brew.just

@@ -2,4 +2,4 @@ test-local:
   #!/bin/bash
   set -xeuo pipefail
 
-  bluebuild rebase recipes/recipe.yml
+  bluebuild rebase --tempdir /var/tmp recipes/recipe.yml

files/system/usr/share/blue95/just/justfile files/system/usr/share/ublue-os/just/60-apps.just

@@ -13,12 +13,18 @@ modules:
       - source: system
         destination: /
 
+  - type: containerfile
+    containerfiles: ["ublue"]
+
+
   - type: rpm-ostree
     install:
       - btop
       - fastfetch
       - libcanberra
       - lightdm-gtk-greeter-settings
+      - mate-disk-usage-analyzer
+      - mate-system-monitor
       - menulibre
       - neovim
       - python3-cairosvg
@@ -44,6 +50,7 @@ modules:
       - 10-install-appimages.sh
       - 20-chicago95.sh
       - 21-fix-icon-sizes.py
+      - 29-finalize-de-tweaks.sh
 
   - type: default-flatpaks
     notify: true # Send notification after install/uninstall is finished