Compare commits

..

No commits in common. "main" and "v0.2.0" have entirely different histories.
main ... v0.2.0

10 changed files with 43 additions and 139 deletions

View file

@ -1,21 +0,0 @@
name: Mirror to GitHub
on:
push:
branches: ['**']
tags: ['**']
jobs:
mirror:
runs-on: [self-hosted, hestia]
steps:
- name: Mirror to GitHub
run: |
set -euo pipefail
git clone --mirror "https://git.breadway.dev/${GITHUB_REPOSITORY}.git" repo.git
cd repo.git
# Mirror only branches and tags (not refs/pull/*, which GitHub rejects);
# --prune deletes GitHub refs that no longer exist on Forgejo.
git push --prune \
"https://x-access-token:${{ secrets.MIRROR_TOKEN }}@github.com/Breadway/breadbox.git" \
'+refs/heads/*:refs/heads/*' '+refs/tags/*:refs/tags/*'

View file

@ -1,40 +0,0 @@
name: Build and publish package
on:
push:
tags: ['v*']
jobs:
package:
runs-on: [self-hosted, hestia]
container:
image: archlinux:latest
steps:
# Note: no actions/checkout — the archlinux image has no Node, which JS
# actions require. Everything runs as shell steps and clones manually.
- name: Build and publish
env:
PUBLISH_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
run: |
set -euo pipefail
VERSION="${GITHUB_REF_NAME#v}"
pacman -Syu --noconfirm base-devel git rust cargo gtk4 gtk4-layer-shell librsvg
useradd -m builder
git config --global --add safe.directory '*'
git clone --branch "${GITHUB_REF_NAME}" --depth 1 \
"https://git.breadway.dev/${GITHUB_REPOSITORY}.git" /home/builder/src
cd /home/builder/src
git archive --format=tar.gz --prefix="breadbox-${VERSION}/" HEAD \
> packaging/arch/breadbox-${VERSION}.tar.gz
SHA=$(sha256sum packaging/arch/breadbox-${VERSION}.tar.gz | awk '{print $1}')
sed -i "s/^pkgver=.*/pkgver=${VERSION}/" packaging/arch/PKGBUILD
sed -i "s/^sha256sums=.*/sha256sums=('${SHA}')/" packaging/arch/PKGBUILD
chown -R builder:builder /home/builder/src
# --nocheck: packaging builds the artifact; tests belong in a CI job.
su builder -c "cd /home/builder/src/packaging/arch && makepkg -f --noconfirm --nocheck"
PKG=$(find /home/builder/src/packaging/arch -name '*.pkg.tar.zst' | head -1)
curl -fsS -X PUT \
-H "Authorization: token ${PUBLISH_TOKEN}" \
-H "Content-Type: application/octet-stream" \
--data-binary "@${PKG}" \
"https://git.breadway.dev/api/packages/Breadway/arch/os"

View file

@ -9,7 +9,7 @@ permissions:
env:
DL_DIR: /srv/breadway-dl
ECOSYSTEM_DIR: /tmp/bread-ecosystem-ci
ECOSYSTEM_DIR: /home/breadway/Projects/bread-ecosystem
jobs:
build:
@ -41,8 +41,12 @@ jobs:
- name: ensure bread-ecosystem
run: |
rm -rf "${ECOSYSTEM_DIR}"
if [[ -d "${ECOSYSTEM_DIR}/.git" ]]; then
git -C "${ECOSYSTEM_DIR}" pull --ff-only
else
mkdir -p "$(dirname "${ECOSYSTEM_DIR}")"
git clone https://github.com/Breadway/bread-ecosystem.git "${ECOSYSTEM_DIR}"
fi
- name: regenerate index.json
run: bash "${ECOSYSTEM_DIR}/scripts/gen-index.sh"

10
Cargo.lock generated
View file

@ -28,8 +28,8 @@ checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
[[package]]
name = "bread-theme"
version = "0.2.3"
source = "git+https://github.com/Breadway/bread-ecosystem?tag=v0.2.8#77417d552130281ff787e07d52541eb25e9d533b"
version = "0.1.0"
source = "git+https://github.com/Breadway/bread-ecosystem?tag=v0.1.0#6b5f4f475f66a645b08cb865e6dda8228d23679b"
dependencies = [
"dirs",
"gtk4",
@ -39,7 +39,7 @@ dependencies = [
[[package]]
name = "breadbox"
version = "0.2.4"
version = "0.2.0"
dependencies = [
"bread-theme",
"breadbox-shared",
@ -50,7 +50,7 @@ dependencies = [
[[package]]
name = "breadbox-shared"
version = "0.2.4"
version = "0.2.0"
dependencies = [
"serde",
"serde_json",
@ -59,7 +59,7 @@ dependencies = [
[[package]]
name = "breadbox-sync"
version = "0.2.4"
version = "0.2.0"
dependencies = [
"breadbox-shared",
"serde_json",

View file

@ -2,7 +2,6 @@ name = "breadbox"
description = "App launcher for Hyprland / Wayland"
binaries = ["breadbox", "breadbox-sync"]
system_deps = ["gtk4", "gtk4-layer-shell", "librsvg"]
optional_system_deps = ["hyprland"]
bread_deps = []
[[service]]

View file

@ -1,6 +1,6 @@
[package]
name = "breadbox-shared"
version = "0.2.4"
version = "0.2.0"
edition = "2021"
license = "MIT"

View file

@ -1,6 +1,6 @@
[package]
name = "breadbox-sync"
version = "0.2.4"
version = "0.2.0"
edition = "2021"
license = "MIT"

View file

@ -1,6 +1,6 @@
[package]
name = "breadbox"
version = "0.2.4"
version = "0.2.0"
edition = "2021"
license = "MIT"
@ -9,7 +9,7 @@ name = "breadbox"
path = "src/main.rs"
[dependencies]
bread-theme = { git = "https://github.com/Breadway/bread-ecosystem", tag = "v0.2.8", features = ["gtk"] }
bread-theme = { git = "https://github.com/Breadway/bread-ecosystem", tag = "v0.1.0", features = ["gtk"] }
breadbox-shared = { path = "../breadbox-shared" }
gtk4 = { version = "0.11", features = ["v4_12"] }
gtk4-layer-shell = "0.8"

View file

@ -1,4 +1,4 @@
use bread_theme::{hex_to_rgba, ink_on, load_palette, Palette};
use bread_theme::{hex_to_rgba, load_palette, Palette};
use std::{
cell::RefCell,
collections::HashMap,
@ -15,6 +15,7 @@ use breadbox_shared::{
config_dir, load_all_desktop_entries, Config, DesktopEntry, IconCache, LaunchHistory,
};
use gtk4::{
gdk::Display,
glib,
pango::EllipsizeMode,
prelude::*,
@ -132,32 +133,26 @@ fn matches_term(field: &str, term: &str) -> bool {
fn build_css(p: &Palette) -> String {
let bg_panel = hex_to_rgba(&p.background, 0.60);
// breadbox-specific rules only — fonts, palette, and generic widgets come
// from the shared ecosystem stylesheet (applied first in connect_activate).
// Colour is set on each surface (panel, search box, hovered/selected row) so
// child labels inherit the legible ink for that background. `on_*` are
// luminance-picked black/white — the pywal hues are untouched. Without this a
// light `surface` slot makes the selected row's text vanish.
format!(
"window {{ background-color: transparent; }}\
.launcher-bg {{ background-color: {bg_panel}; color: {on_bg}; border-radius: 8px;\
"* {{ font-family: 'Varela Round', sans-serif; font-size: 14px; }}\
window {{ background-color: transparent; }}\
.launcher-bg {{ background-color: {bg_panel}; border-radius: 8px;\
box-shadow: 0 8px 32px rgba(0,0,0,0.6); }}\
searchentry {{ background-color: {surface}; color: {on_surface}; caret-color: {accent};\
searchentry {{ background-color: {surface}; color: {fg}; caret-color: {accent};\
border: none; outline: none; box-shadow: none;\
padding: 12px 16px; border-radius: 6px 6px 0 0; }}\
listbox {{ background-color: transparent; padding: 4px; }}\
row {{ padding: 8px 12px; color: {on_bg}; background-color: transparent;\
row {{ padding: 8px 12px; color: {fg}; background-color: transparent;\
border-radius: 6px; }}\
row:hover {{ background-color: {surface}; color: {on_surface}; }}\
row:selected {{ background-color: {surface}; color: {on_surface}; }}\
row:hover {{ background-color: {surface}; }}\
row:selected {{ background-color: {surface}; }}\
.app-name {{ font-size: 14px; }}\
.app-muted {{ opacity: 0.6; font-size: 12px; }}\
.app-muted {{ color: {fg}; opacity: 0.6; font-size: 12px; }}\
image {{ margin-right: 8px; }}",
bg_panel = bg_panel,
surface = p.color0,
fg = p.foreground,
accent = p.color4,
on_bg = ink_on(&p.background),
on_surface = ink_on(&p.color0),
)
}
@ -295,7 +290,7 @@ fn get_row_entry(row: &gtk4::ListBoxRow) -> Option<DesktopEntry> {
}
}
fn run_ui(entries: Vec<DesktopEntry>, history: LaunchHistory) {
fn run_ui(entries: Vec<DesktopEntry>, css: String, history: LaunchHistory) {
let app = Application::builder()
.application_id("com.breadway.breadbox")
.build();
@ -304,11 +299,14 @@ fn run_ui(entries: Vec<DesktopEntry>, history: LaunchHistory) {
let query_rc: Rc<RefCell<String>> = Rc::new(RefCell::new(String::new()));
app.connect_activate(move |app| {
// Shared ecosystem base (fonts, palette, generic widgets) first, then
// breadbox-specific CSS layered on top — both hot-reload on
// `bread-theme reload` (the closure re-reads the pywal palette).
bread_theme::gtk::apply_shared();
bread_theme::gtk::apply_app_css(|| build_css(&load_palette()));
// Base CSS
let provider = CssProvider::new();
provider.load_from_string(&css);
gtk4::style_context_add_provider_for_display(
&Display::default().expect("no display"),
&provider,
gtk4::STYLE_PROVIDER_PRIORITY_APPLICATION,
);
// User CSS override
{
@ -564,5 +562,8 @@ fn main() {
let manifest = load_manifest();
let entries = load_sorted_entries(&manifest, &priority, &history);
run_ui(entries, history);
let palette = load_palette();
let css = build_css(&palette);
run_ui(entries, css, history);
}

View file

@ -1,39 +0,0 @@
# Maintainer: Breadway <rileyhorsham@gmail.com>
pkgname=breadbox
pkgver=0.1.0
pkgrel=1
pkgdesc="App launcher for Hyprland / Wayland"
arch=('x86_64')
url="https://github.com/Breadway/breadbox"
license=('MIT')
# Some Rust deps (ring/mlua) build vendored C/asm into static archives; makepkg's
# default -flto=auto emits GCC LTO bitcode the Rust (lld) link cannot read,
# causing undefined-symbol errors. Disable LTO.
options=(!lto !debug)
depends=('gtk4' 'gtk4-layer-shell' 'librsvg')
optdepends=(
'hyprland: window and workspace integration'
)
makedepends=('rust' 'cargo')
source=("${pkgname}-${pkgver}.tar.gz")
sha256sums=('SKIP')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
cargo build --release --locked
}
check() {
cd "${srcdir}/${pkgname}-${pkgver}"
cargo test --release --locked --workspace
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
install -Dm755 target/release/breadbox "${pkgdir}/usr/bin/breadbox"
install -Dm755 target/release/breadbox-sync "${pkgdir}/usr/bin/breadbox-sync"
install -Dm644 packaging/breadbox-sync.service \
"${pkgdir}/usr/lib/systemd/user/breadbox-sync.service"
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}