Zayin/Classroom_Desktop
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: point mako at the packaged config explicitly

Browse Source 
mako 1.10 only searches $XDG_CONFIG_HOME/mako/config and ~/.mako/config
— confirmed against the shipped binary, and mako(5) documents no system
path. The config installed to /etc/xdg/mako/config would have been read
by nothing and every notification would have come out stock.

Ship it alongside the rest of the package's config in
/etc/ekklesia-classroom/mako/ and name it on mako's command line, which
also keeps it dpkg-owned instead of writing into the user's home.

Start mako before the dock as well, so nothing can send a notification
early and have D-Bus activate an unstyled instance that then holds the
bus name for the rest of the session.

Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
ekklesia
2026-09-04 17:13:00 -05:00
co-authored by Claude Opus 5
parent a8cf9ef337
commit aed4d9737d
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/sway/config
+5 -3
View File
@@ -6,12 +6,14 @@ set $mod Mod4
# Wallpaper # Wallpaper
output * bg /usr/share/backgrounds/ekklesia/classroom-default.png fill output * bg /usr/share/backgrounds/ekklesia/classroom-default.png fill
# Notifications, started before the dock so nothing can race D-Bus into
# activating an unstyled mako first. mako only ever searches ~/.config,
# so the packaged config has to be named explicitly.
exec --no-startup-id /usr/bin/mako --config /etc/ekklesia-classroom/mako/config
# Ekklesia Classroom dock # Ekklesia Classroom dock
exec --no-startup-id /usr/local/bin/classroom-dock exec --no-startup-id /usr/local/bin/classroom-dock
# Notifications. Styled by /etc/xdg/mako/config to match the dock.
exec --no-startup-id /usr/bin/mako
# Keep the interface intentionally minimal. # Keep the interface intentionally minimal.
# Additional classroom controls are added explicitly by Ekklesia Classroom. # Additional classroom controls are added explicitly by Ekklesia Classroom.
tools/build-release.sh
+3 -2
View File
@@ -119,10 +119,11 @@ install -Dm644 \
"$ROOT/config/dock/style.css" \ "$ROOT/config/dock/style.css" \
"$STAGE/etc/ekklesia-classroom/dock/style.css" "$STAGE/etc/ekklesia-classroom/dock/style.css"
# Notification styling, matched to the dock. # Notification styling, matched to the dock. mako only searches
# ~/.config, so sway starts it with an explicit --config path.
install -Dm644 \ install -Dm644 \
"$ROOT/config/mako/config" \ "$ROOT/config/mako/config" \
"$STAGE/etc/xdg/mako/config" "$STAGE/etc/ekklesia-classroom/mako/config"
# Chrome enterprise policy: suppress first-run and sign-in nags, and pin # Chrome enterprise policy: suppress first-run and sign-in nags, and pin
# Home to Wonder Ink. Nothing here restricts where teachers can browse. # Home to Wonder Ink. Nothing here restricts where teachers can browse.