fix: make an existing classroom converge into the Plasma appliance
A real room upgraded to 0.1.45 and came up as stock Debian Plasma with the old Waybar across the top, mako still catching notifications, and a lock screen on an account that has no password. The cause was one line, and it was in the lab: the harness handed the session under test XDG_CONFIG_DIRS by hand, so every result it had ever produced was a result about a machine somebody had already configured. On a machine SDDM starts the session through PAM, PAM does not read /etc/environment.d, and Debian's own plasma-workspace env.sh then set the variable from scratch — so the classroom's settings directory was not in the cascade at all. No layout, no lock policy, no Kiosk restrictions. The settings now arrive the way Plasma delivers them, through a file in /etc/xdg/plasma-workspace/env. Around that: the look and feel is immutable on its own key so a stale profile cannot answer for it; the palette is composed into the package, because naming a colour scheme does not produce one and the dark bar had been coming from a technician's hand; the desktop reset converges another desktop's appearance state and keeps the room's own; and classroom-migrate stops, deactivates and masks the old shell, including the D-Bus activation that brought mako back while the panel was down — found only by killing the panel on a migrated machine. device.conf loses COMPOSITOR and comes off the hyprland channel, which would otherwise have handed the room the experiment back. The lab stops flattering the package: it restarts the machine, lets SDDM actually autologin, and asks a fresh install and a machine upgraded from the Hyprland package the same sixty questions. Both answer identically, twice, and the panel still comes back from eight SIGKILLs. Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
ekklesia
co-authored by
Claude Opus 5
Claude Opus 5
parent
6050144e5d
commit
926668dc9b
@@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
|
||||
# Make the panel come from the package, every time.
|
||||
# Make the desktop come from the package, every time.
|
||||
#
|
||||
# Plasma builds the panel from the classroom's layout script whenever it
|
||||
# starts with no panel configuration, and keeps whatever it built after
|
||||
@@ -17,16 +17,131 @@ set -euo pipefail
|
||||
#
|
||||
# Nothing is lost by this. The panel is immutable to teachers by Kiosk
|
||||
# policy, so there is never anything of theirs in that file.
|
||||
#
|
||||
# This runs before plasmashell, as a user service ordered Before it.
|
||||
|
||||
CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/plasma-org.kde.plasma.desktop-appletsrc"
|
||||
CLASSROOM_XDG=/etc/ekklesia-classroom/xdg
|
||||
CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
|
||||
CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
|
||||
|
||||
say() {
|
||||
echo "classroom-desktop-reset: $1"
|
||||
}
|
||||
|
||||
# THE CASCADE.
|
||||
#
|
||||
# Everything below this line is pointless if Plasma is not reading the
|
||||
# classroom's settings directory at all: without it the room gets stock
|
||||
# Plasma, no Kiosk restrictions and a lock screen. The session environment
|
||||
# is set by /etc/xdg/plasma-workspace/env/zz-ekklesia-classroom.sh, which
|
||||
# is the mechanism Plasma itself provides. This is the assertion, not the
|
||||
# mechanism: if the variable arrives here wrong, say so out loud and fix it
|
||||
# for the shell that is about to start rather than build a wrong desktop
|
||||
# quietly.
|
||||
case ":${XDG_CONFIG_DIRS:-}:" in
|
||||
*:"$CLASSROOM_XDG":*)
|
||||
;;
|
||||
*)
|
||||
say "XDG_CONFIG_DIRS did not contain $CLASSROOM_XDG — repairing it"
|
||||
export XDG_CONFIG_DIRS="$CLASSROOM_XDG:${XDG_CONFIG_DIRS:-/etc/xdg}"
|
||||
systemctl --user set-environment \
|
||||
"XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS" 2>/dev/null || true
|
||||
;;
|
||||
esac
|
||||
|
||||
# FOREIGN APPEARANCE STATE.
|
||||
#
|
||||
# A classroom machine that has been through another desktop arrives with a
|
||||
# profile that answers questions the package means to answer. Two places
|
||||
# sit ahead of the classroom's own directory in KConfig's cascade:
|
||||
#
|
||||
# ~/.config/kdedefaults what the last look and feel applied wrote.
|
||||
# Plasma also treats it as the record of which
|
||||
# look and feel is in force: remove it and the
|
||||
# next session applies ours again from scratch,
|
||||
# which resets the palette to the package
|
||||
# default. That is right for a machine arriving
|
||||
# from another desktop and wrong for a room that
|
||||
# chose the light theme, so whose it is decides.
|
||||
#
|
||||
# ~/.config/kdeglobals the user's own file, which beats every system
|
||||
# directory. plasma-apply-colorscheme expands a
|
||||
# whole palette into it, so a light Breeze scheme
|
||||
# from a previous desktop would keep the room
|
||||
# light no matter what the package said.
|
||||
#
|
||||
# The colour scheme is the one piece of appearance a room is allowed to
|
||||
# choose, through classroom-theme, so an Ekklesia scheme is kept and
|
||||
# anything else is removed. This is not a wipe of the home directory: two
|
||||
# named pieces of appearance state, neither of them a teacher's work.
|
||||
|
||||
# The [General] ColorScheme of a KConfig file, or nothing.
|
||||
scheme_of() {
|
||||
awk -F= '
|
||||
/^\[/ { general = ($0 == "[General]"); next }
|
||||
general && $1 == "ColorScheme" { print $2; exit }
|
||||
' "$1" 2>/dev/null || true
|
||||
}
|
||||
|
||||
defaults_are_ours=no
|
||||
|
||||
if [[ -d "$CONFIG_HOME/kdedefaults" ]]; then
|
||||
case "$(scheme_of "$CONFIG_HOME/kdedefaults/kdeglobals")" in
|
||||
Ekklesia*)
|
||||
defaults_are_ours=yes
|
||||
;;
|
||||
*)
|
||||
rm -rf "$CONFIG_HOME/kdedefaults"
|
||||
say "removed another desktop's look and feel defaults"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if [[ -f "$CONFIG_HOME/kdeglobals" ]]; then
|
||||
scheme=$(scheme_of "$CONFIG_HOME/kdeglobals")
|
||||
|
||||
case "$scheme" in
|
||||
Ekklesia*)
|
||||
say "keeping the room's colour scheme ($scheme)"
|
||||
;;
|
||||
"")
|
||||
# No scheme named. That is what Plasma leaves behind after it
|
||||
# applies a look and feel — it writes a hash instead — so the
|
||||
# palette belongs to whichever look and feel last ran, and the
|
||||
# directory above has just said whose that was.
|
||||
if [[ "$defaults_are_ours" == yes ]]; then
|
||||
say "keeping the palette the classroom's look and feel left"
|
||||
else
|
||||
rm -f "$CONFIG_HOME/kdeglobals"
|
||||
say "removed an unnamed palette from another desktop"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
rm -f "$CONFIG_HOME/kdeglobals"
|
||||
say "removed a foreign palette ($scheme); the package supplies one"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# The room's power behaviour is policy, not preference: never sleep, never
|
||||
# dim, never lock. PowerDevil loads an idle action when it finds a group
|
||||
# for it, and the merged view of this file is where such a group could
|
||||
# come from, so the user's copy goes at every login. Nothing of a
|
||||
# teacher's is in it — there is no settings application in this room.
|
||||
if [[ -f "$CONFIG_HOME/powermanagementprofilesrc" ]]; then
|
||||
rm -f "$CONFIG_HOME/powermanagementprofilesrc"
|
||||
say "cleared the user's power settings; the package supplies them"
|
||||
fi
|
||||
|
||||
CONFIG="$CONFIG_HOME/plasma-org.kde.plasma.desktop-appletsrc"
|
||||
|
||||
if [[ -e "$CONFIG" ]]; then
|
||||
rm -f "$CONFIG"
|
||||
echo "classroom-desktop-reset: panel will be rebuilt from the layout"
|
||||
say "panel will be rebuilt from the layout"
|
||||
else
|
||||
echo "classroom-desktop-reset: no panel configuration to clear"
|
||||
say "no panel configuration to clear"
|
||||
fi
|
||||
|
||||
# The icon cache remembers a name it once failed to find, which outlives
|
||||
# the package that later supplies it.
|
||||
rm -f "${XDG_CACHE_HOME:-$HOME/.cache}/icon-cache.kcache" 2>/dev/null || true
|
||||
rm -f "$CACHE_HOME/icon-cache.kcache" 2>/dev/null || true
|
||||
|
||||
Reference in New Issue
Block a user