From e1af4dbfac4e2d6d3f959158e7857b4f527fa3a9 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 24 Jul 2026 12:26:16 -0700 Subject: [PATCH] Drive the config install leaves through install/config/all.sh Co-Authored-By: Claude Opus 5 (1M context) --- bin/omarchy-setup-system | 9 +-------- docs/file-layout.md | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/bin/omarchy-setup-system b/bin/omarchy-setup-system index d66cbf80..e2fedb4b 100755 --- a/bin/omarchy-setup-system +++ b/bin/omarchy-setup-system @@ -73,14 +73,7 @@ export PATH="$OMARCHY_PATH/bin:$PATH" source "$OMARCHY_INSTALL/helpers/logging.sh" start_install_log -run_logged "$OMARCHY_INSTALL/config/theme-system.sh" -run_logged "$OMARCHY_INSTALL/config/increase-lockout-limit.sh" -run_logged "$OMARCHY_INSTALL/config/lockscreen-pam.sh" -run_logged "$OMARCHY_INSTALL/config/fix-powerprofilesctl-shebang.sh" -run_logged "$OMARCHY_INSTALL/config/docker.sh" -run_logged "$OMARCHY_INSTALL/config/snapper.sh" -run_logged "$OMARCHY_INSTALL/config/enable-services.sh" -run_logged "$OMARCHY_INSTALL/config/firewall.sh" +source "$OMARCHY_INSTALL/config/all.sh" omarchy-setup-hardware --install-user "$install_user" diff --git a/docs/file-layout.md b/docs/file-layout.md index 18c4f0f3..14570d6c 100644 --- a/docs/file-layout.md +++ b/docs/file-layout.md @@ -247,7 +247,7 @@ the legacy finalization marker from `~/.local/state/omarchy/` into `done/`. `omarchy-setup-system` (root, in chroot) runs target-side setup at ISO finalization. It sources: -- `install/config/*.sh` — theme links, lockout limits, lockscreen PAM, +- `install/config/all.sh` — theme links, lockout limits, lockscreen PAM, powerprofilesctl shebang fix, docker setup, service enablement, firewall. - `install/hardware/all.sh` via `omarchy-setup-hardware` — vendor- and device-specific kernel modules, udev rules, microcode, wireless regdom, @@ -287,7 +287,7 @@ return to the packaged default. | Package-owned system file (e.g. systemd user service/path in `/usr/lib`) | `default/`, document the mapping in `default/package-defaults.tsv`, then add the `install -Dm644` line in `omarchy-settings` PKGBUILD | | Per-user file that's static but lives outside `~/.config` | `default/`, then add `install -Dm644 ... $pkgdir/etc/skel/...` in `omarchy-settings` PKGBUILD | | Runtime tweak that needs `$HOME` or live system state | extend `omarchy-finalize-user`, or add a per-user leaf under `install/user/` and wire into `install/user/all.sh` | -| One-time root-side setup step | `install/config/*.sh` or `install/hardware/*.sh`, wire into `omarchy-setup-system` or `install/hardware/all.sh` | +| One-time root-side setup step | `install/config/*.sh` or `install/hardware/*.sh`, wire into `install/config/all.sh` or `install/hardware/all.sh` | | One-time fix for existing installs | `migrations/.sh` | | User-facing `omarchy-*` command | `bin/omarchy--` — see `GROUP_DESCRIPTIONS` in `bin/omarchy` | | New stock theme | `themes//` (+ matching templates under `default/themed/` if they need theme colors) |