Skip to content

feat!: align with Omarchy PR #16920 - #16

Merged
lbssousa merged 1 commit into
mainfrom
feat/upstream-alignment
Nov 10, 2026
Merged

lbssousa merged 1 commit into
mainfrom
feat/upstream-alignment

Conversation

@lbssousa

Copy link
Copy Markdown
Owner

Summary

Aligns omarchy-multiuser with Omarchy PR #16920 while preserving all existing omarchy-multiuser capabilities (per-user FIDO2 and fingerprint, migration handling, lock screen & greeter controls, menu i18n, admin promote/demote, etc.):

  1. Journaled account creation & removal (omarchy-mu-user-helper):
    • add and delete now run inside /var/lib/omarchy-multiuser/password-journal (op=add|password|delete), rolling back or forward on interruption via finish.
    • omarchy-mu-user-remove verifies the caller's password up front (helper verify) before cleaning up FIDO2/fingerprints and calling helper delete.
    • Refuses killing the system disk's last LUKS key slot even when finishing a journal.
  2. Root password holder (/etc/omarchy-multiuser/root):
    • Root's password follows its recorded holder instead of locking root when multiple accounts exist.
    • Deleting or demoting the holder hands root over to the calling administrator (root-take); a root account locked by an earlier version is unlocked on the holder's next password change.
  3. Handoff when Omarchy ships Setup › Users (omarchy-mu-handoff):
    • Detects upstream's omarchy-user-helper and omarchy-login-select, finishes any pending journal, copies /etc/omarchy-multiuser/{slots,root} to /etc/omarchy/users/, removes our PAM line and mkinitcpio hook when upstream's is present, and steps aside.
    • Triggered by 96-omarchy-mu-handoff.hook and package post_install/post_upgrade.
  4. Menu & system disk password (omarchy-mu-drive-password):
    • Exposes Setup › Users (Change Password) to all users and hides Update › Password › User.
    • Wraps omarchy-drive-password so the system disk is excluded once per-user LUKS slots manage it.
  5. Child accounts (omarchy-child):
    • omarchy-mu-user-add --child creates a limited account in omarchy-child with a local git identity and default blocked apps (share/child-blocked-apps).
    • Lock screen fallback (omarchy-mu-user-helper adult-check, rate-limited and logged) lets an administrator unlock a child's session.
    • Per-user blocked apps (omarchy-mu-user-apps, omarchy-mu-user-apps-apply, and 95-omarchy-mu-blocked-apps.hook) enforce binary ACLs and hide desktop entries.
  6. Hardening (lib/omarchy-multiuser/security.sh):
    • omarchy-mu-user-helper, omarchy-mu-login-match, omarchy-mu-fido2-authfile, and omarchy-mu-apply-lock require privileged #!/bin/bash -p startup, strip BASH_ENV/SHELLOPTS/exported functions, enforce a fixed PATH and umask as root, ignore OMU_* test overrides under sudo/pkexec/PAM, and ignore caller OMARCHY_PATH in omarchy-mu-apply-lock.

Testing

  • Full test suite (just test: Node JS tests, all shell test suites including new handoff, drive-password, children, and security suites, shellcheck, qmllint, greeter-smoke, and visudo -cf) passes inside the Arch CI container.

…r, handoff, children, hardening)

- Journal account creation and removal in omarchy-mu-user-helper (add,
  delete, verify) alongside password changes, and refuse removing the
  disk's last LUKS key slot even when finishing a journal.
- Track root's password holder in /etc/omarchy-multiuser/root instead of
  locking root when there are multiple accounts; hand root over on delete
  or demotion (root-take), and unlock a previously locked root on the
  holder's next password change.
- Add omarchy-mu-handoff and 96-omarchy-mu-handoff.hook to hand slot map
  and root holder over to /etc/omarchy/users and step aside once Omarchy
  ships its own Setup > Users.
- Expose Setup > Users (with Change Password) to all users, hide
  Update > Password > User, and add omarchy-mu-drive-password to exclude
  the system disk from Drive Encryption password changes.
- Add child accounts (omarchy-child group, omarchy-mu-user-add --child),
  adult-check unlock fallback on the lock screen, and per-user blocked
  apps (omarchy-mu-user-apps, omarchy-mu-user-apps-apply, pacman hook).
- Harden NOPASSWD/sudo/pkexec/PAM entry points (lib/omarchy-multiuser/security.sh):
  require privileged bash -p startup, sanitize exported functions and
  dangerous env vars, enforce a fixed PATH and umask as root, ignore
  OMU_* overrides under PAM/sudo/pkexec, and ignore caller OMARCHY_PATH
  in omarchy-mu-apply-lock.
@lbssousa
lbssousa merged commit 7559006 into main Nov 10, 2026
1 check passed
@lbssousa
lbssousa deleted the feat/upstream-alignment branch November 10, 2026 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant