Capture mesh-catalog at feat/r4g (2246ccc4) with the templates its manifests name and its predefined.json, and lay the copy out as a repository's root

The catalogue's manifests moved their content into template files and fall back to predefined keys, so a copy of
module.json alone no longer passes the catalogue's own check; the bus's Dockerfile is gone from the catalogue.
This commit is contained in:
2026-10-23 16:24:14 +02:00
parent 68c1220e87
commit 5ccc87f4d0
455 changed files with 12335 additions and 1333 deletions
+51
View File
@@ -0,0 +1,51 @@
# The mesh's block (module xorg, novox/hq ADR 0208 §5): the graphical session's start, replaced at
# every push. It ends by starting the session, so no line below it in this file runs any more. A line
# of your own that must run at every session start goes in ~/.xinitrc.local, which this block sources
# just before the session starts (the module's README lists where each of today's lines went).
# 1. The account's environment (ADR 0203): the file every shell sources, written by node-environment.
if [ -r "${machine:account-home}/.config/mesh/environment.sh" ]; then
. "${machine:account-home}/.config/mesh/environment.sh"
fi
# The session bus is the user manager's. pam_systemd normally hands it over; when it did not, take
# the canonical socket rather than starting a second bus, which runs every D-Bus-activated service
# twice (two notifiers, two portals) and hides one copy from the other.
if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && [ -S "/run/user/$(id -u)/bus" ]; then
DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$(id -u)/bus"
export DBUS_SESSION_BUS_ADDRESS
fi
# 2. The session's own words into the user manager and D-Bus activation, so the portal, the notifier
# and every user service see the display and the desktop's identity. An explicit list and never
# --all: a session's environment may hold things no user service should be able to read back.
mesh_words=
for mesh_word in DISPLAY XAUTHORITY XDG_SESSION_TYPE XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP \
XDG_CONFIG_HOME XDG_DATA_DIRS GTK_THEME GTK2_RC_FILES QT_QPA_PLATFORMTHEME QT_STYLE_OVERRIDE \
QT_SELECT XCURSOR_THEME XCURSOR_SIZE TERMINAL; do
if printenv "$mesh_word" >/dev/null 2>&1; then
mesh_words="$mesh_words $mesh_word"
fi
done
dbus-update-activation-environment --systemd $mesh_words
unset mesh_word mesh_words
# 3. X resources: the mesh's, then yours in ~/.Xresources, which win. The mesh's file is merged
# without the C preprocessor, so no compiler is needed for it.
xrdb -nocpp -merge "${machine:account-home}/.config/xorg/xresources"
if [ -r "$HOME/.Xresources" ]; then
xrdb -merge "$HOME/.Xresources"
fi
# 4. The monitors: the saved layout profile that matches the monitors connected, if one does.
if command -v autorandr >/dev/null 2>&1; then
autorandr --change >/dev/null 2>&1 || true
fi
# 5. Other modules' session lines (ADR 0208 §4), then yours.
${shell:xinitrc:first}${shell:xinitrc:normal}if [ -r "$HOME/.xinitrc.local" ]; then
. "$HOME/.xinitrc.local"
fi
# 6. The session itself: the holder of node-display-session starts it from the last slot.
${shell:xinitrc:last}
@@ -0,0 +1,13 @@
! The mesh's X resources (module xorg, novox/hq ADR 0208 §4), replaced at every push. The session's
! start merges them with xrdb -nocpp before ~/.Xresources, so your own resources there win. Without
! the preprocessor there is no #include or #define here, and a line starting with # is skipped,
! which is what the line naming each contributing module is.
!
! Font rendering, as both workstations had it. 96 DPI becomes a setting with issue 168; xorg_dpi
! changes it for the running session.
Xft.dpi: 96
Xft.antialias: 1
Xft.hinting: 1
Xft.hintstyle: hintslight
Xft.rgba: rgb
${shell:xresources:first}${shell:xresources:normal}${shell:xresources:last}