Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ release tags.
release's, and one built in between is newer than its version says until
the next release replaces it.
- The layout is upstream Omarchy's: the Omarchy tree in `/usr/share/omarchy`
(`OMARCHY_PATH`) with its commands in `/usr/bin`, the greeter in
`/usr/share/omarchy-greeter`, session helpers in `/usr/libexec`, the tablet
(`OMARCHY_PATH`) with its commands in `/usr/bin`, session helpers in
`/usr/libexec`, the tablet
user's defaults in `/etc/skel` (and in `/usr/share/omarchy/config`, where
`omarchy-refresh-config` copies them from), `system/overlay` where it says.
Files another package owns (filesystem's `/etc/os-release`, bluez's
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ is missing or empty.
in red without anything moving.
- The Home button responds to every press: it no longer depends on what the
keyboard is doing.
- No more separate login screen: the tablet boots straight to the lock, the
same screen as after Power, and the desktop is ready the moment you enter
the PIN. Logout starts a fresh desktop behind the lock.

## [0.3.2] - 2026-11-19

Expand Down
1 change: 0 additions & 1 deletion desktop/configuration/first-theme
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ if [[ ! -e "$state/icons.revision" ]]; then
fi
# Apply the same GTK light/dark and icon settings as upstream Omarchy.
omarchy-theme-set-gnome || echo 'Warning: could not update GTK theme settings' >&2
if command -v omarchy-greeter-theme-publish >/dev/null; then omarchy-greeter-theme-publish || true; fi
# This only registers the user hook and queues local theme state; it does not
# copy or reuse the VM's Firefox profile. Package installation is a separate step.
if command -v omafox >/dev/null; then
Expand Down
24 changes: 20 additions & 4 deletions desktop/configuration/login-session
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash
# Started by greetd on VT1 once PAM accepted the PIN, never from SSH.
# Started by greetd on VT1 at boot, without a prompt (its initial session),
# never from SSH. The session starts locked: the PIN is the lock's.
set -euo pipefail
[[ ${XDG_VTNR:-} == 1 && ${USER:-} == tablet && -z ${SSH_CONNECTION:-} ]] || exit 1
[[ -n ${XDG_SESSION_ID:-} && -d ${XDG_RUNTIME_DIR:-/nonexistent} && -O $XDG_RUNTIME_DIR ]] || {
Expand All @@ -11,8 +12,6 @@ set -euo pipefail
exit 1
}
export DBUS_SESSION_BUS_ADDRESS="unix:path=$XDG_RUNTIME_DIR/bus"
# The user session must read its live theme, not the greeter's snapshot.
unset OMARCHY_GREETER_THEME_DIR
export OMARCHY_PATH=/usr/share/omarchy
export XDG_SESSION_TYPE=wayland XDG_CURRENT_DESKTOP=labwc
export WLR_RENDERER=pixman QT_QUICK_BACKEND=software QT_QPA_PLATFORM=wayland
Expand Down Expand Up @@ -108,4 +107,21 @@ omarchy-toggle-maximize-windows --apply || true
session_config=$XDG_RUNTIME_DIR/omarchy-xdg-config
/usr/libexec/arch-ipad-touch-output "$session_config/labwc/rc.xml" || true
export XDG_CONFIG_DIRS="$HOME/.local/state/omarchy/xdg-config:$session_config:${XDG_CONFIG_DIRS:-/etc/xdg}"
exec /usr/bin/labwc -m
# The shell takes the lock before the desktop is seen: Labwc's startup cover
# lifts only once the lock is drawn (plugins/lock/Service.qml).
export OMARCHY_START_LOCKED=1
# A logout ends Labwc; so does a crash. Either way the desktop starts again
# here, behind the lock: there is no login screen to go back to. A desktop that
# ends within 10 s three times in a row (a second apart) is not restarted: greetd then runs
# omarchy-session-failed, and serial and SSH are there.
quick=0
while :; do
started=$SECONDS
/usr/bin/labwc -m || true
if (( SECONDS - started < 10 )); then
(( ++quick < 3 )) || { logger -t omarchy-session 'The desktop ended at once three times; not restarting it'; exit 1; }
sleep 1
else
quick=0
fi
done
8 changes: 0 additions & 8 deletions desktop/greeter/greetd.toml

This file was deleted.

20 changes: 0 additions & 20 deletions desktop/greeter/greeter-session

This file was deleted.

7 changes: 0 additions & 7 deletions desktop/greeter/labwc/autostart

This file was deleted.

17 changes: 0 additions & 17 deletions desktop/greeter/labwc/rc.xml

This file was deleted.

117 changes: 0 additions & 117 deletions desktop/greeter/shell.qml

This file was deleted.

32 changes: 6 additions & 26 deletions desktop/install-tree
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
# BUILD holds the compiled keyboard and cursor helper (`make`), OMARCHY the
# pinned upstream Omarchy (desktop/upstream.lock), DBUS_NEXT the unpacked
# dbus-next wheel. The layout is upstream Omarchy's package's: the Omarchy
# tree in /usr/share/omarchy (OMARCHY_PATH) with its commands in /usr/bin, the
# greeter in /usr/share/omarchy-greeter, helpers in /usr/libexec, the tablet
# tree in /usr/share/omarchy (OMARCHY_PATH) with its commands in /usr/bin,
# helpers in /usr/libexec, the tablet
# user's defaults in /etc/skel (and /usr/share/omarchy/config, where
# omarchy-refresh-config copies them from), system/overlay where it says.
# Files another package owns go to /usr/share/omarchy/etc-overrides; the
Expand Down Expand Up @@ -41,20 +41,8 @@ mkdir -p "$omarchy"
cp -R "$shell/." "$omarchy/"
find "$omarchy" \( -name __pycache__ -o -name '*.pyc' \) -prune -exec rm -rf {} +

# The greeter, system-owned: never read from the user's home directory, with the
# shell's shared UI code.
greeter=$root/usr/share/omarchy-greeter
mkdir -p "$greeter"
cp -R "$here/greeter/." "$greeter/"
cp -R "$shell/shell/Commons" "$shell/shell/Ui" "$greeter/"
for name in LockView.qml; do
put "$shell/shell/plugins/lock/$name" "$greeter/plugins/lock/$name"
done
chmod 755 "$greeter/labwc/autostart"
put "$here/greeter/greeter-session" "$root/usr/libexec/omarchy-greeter-session" 755

# Upstream's themes at the pin. Jade Horse, upstream's default, is the tablet's
# first theme and the greeter's fallback.
# first theme.
cp -RP "$upstream/themes" "$omarchy/themes"
# Upstream's app icon sets (Papercraft, the default; Arcade; Original).
cp -RP "$upstream/icons" "$omarchy/icons"
Expand All @@ -66,15 +54,6 @@ cp -R "$here/icons/." "$omarchy/icons/"
for set in "$omarchy"/icons/*/; do
if [[ -f $set/btop.svg.tpl && ! -e $set/omactivity.svg.tpl ]]; then ln -s btop.svg.tpl "$set/omactivity.svg.tpl"; fi
done
theme=$omarchy/themes/jade-horse
put "$theme/colors.toml" "$greeter/default-theme/colors.toml"
[[ ! -f $theme/shell.toml ]] || put "$theme/shell.toml" "$greeter/default-theme/shell.toml"
background=$(find "$theme/backgrounds" -maxdepth 1 -type f \
\( -iname '*.webp' -o -iname '*.png' -o -iname '*.jpg' -o -iname '*.jpeg' \) | LC_ALL=C sort | head -n 1)
[[ -n $background ]] || { echo 'The default theme has no image background' >&2; exit 1; }
put "$background" "$greeter/default-theme/background"
mkdir -p "$root/usr/lib/tmpfiles.d"
printf 'd /var/lib/omarchy-greeter-theme 0755 tablet tablet -\n' > "$root/usr/lib/tmpfiles.d/omarchy-greeter-theme.conf"

# The keyboard and the startup cursor helper.
put "$build/wvkbd-mobintl" "$omarchy/trials/wvkbd-mobintl-v0.20-font18-special15-state" 755
Expand Down Expand Up @@ -127,7 +106,7 @@ done
# Files another package owns (bash's /etc/skel/.bashrc, greetd's config).
overrides=$omarchy/etc-overrides
put "$config/bashrc" "$overrides/etc/skel/.bashrc"
put "$here/greeter/greetd.toml" "$overrides/etc/greetd/config.toml"
put "$here/login/greetd.toml" "$overrides/etc/greetd/config.toml"

# The session's helpers and system files.
while read -r source name mode; do
Expand All @@ -139,7 +118,8 @@ $config/auto-brightness usr/libexec/arch-ipad-auto-brightness 755
$config/rotate-output usr/libexec/arch-ipad-rotate-output 755
$config/touch-output usr/libexec/arch-ipad-touch-output 755
$config/login-session usr/libexec/arch-ipad-login-session 755
$here/greeter/greetd-seatd.conf etc/systemd/system/greetd.service.d/seatd.conf 644
$here/login/greetd-seatd.conf etc/systemd/system/greetd.service.d/seatd.conf 644
$here/login/session-failed usr/libexec/omarchy-session-failed 755
$config/networkmanager.rules etc/polkit-1/rules.d/40-arch-ipad-networkmanager.rules 644
$config/firefox-policies.json usr/lib/firefox/distribution/policies.json 644
$config/firefox-autoconfig.js usr/lib/firefox/defaults/pref/omarchy-a.js 644
Expand Down
File renamed without changes.
22 changes: 22 additions & 0 deletions desktop/login/greetd.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# No login screen: at boot greetd starts the tablet's session without a prompt,
# and the session starts locked. The PIN is the lock's (/etc/pam.d/
# omarchy-lock-password, written by the installer); a logout starts the desktop
# again behind the lock, inside this same session (arch-ipad-login-session).
[terminal]
vt = 1

# The sessions' PAM service: no password step, the tablet user only, the usual
# account and session rules. greetd 0.10 takes the initial session's service
# from here, not from that section.
[general]
service = "greetd-autologin"

[initial_session]
command = "/usr/libexec/arch-ipad-login-session"
user = "tablet"

# greetd runs this only when no session runs: the tablet's never came up or
# gave up. It says so in the journal; serial and SSH are there as always.
[default_session]
command = "/usr/libexec/omarchy-session-failed"
user = "greeter"
6 changes: 6 additions & 0 deletions desktop/login/session-failed
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh
# greetd's default session: it runs only when the tablet's session is not
# running (it refused to start, or its desktop kept ending at once). There is
# no login screen to show instead; serial and SSH still log in.
logger -t omarchy-session 'The tablet session is not running; see journalctl -b -t omarchy-session -t greetd. Serial and SSH are available.'
exec sleep infinity
Loading
Loading