Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Frank
|
b4fc881164 | ||
|
Frank
|
6df45d709a | ||
 dank
|
5ab0a49ea4 | ||
|
Frank
|
4666d0dce0 | ||
|
dank
|
d013795922 | ||
|
Frank
|
2b7b0bc3cd | ||
|
dank
|
3809e1ed22 | ||
|
Frank
|
e278e4b863 | ||
|
dank
|
c05f5ad451 | ||
|
Frank
|
ecc089c6ef | ||
|
dank
|
7523ca5c19 | ||
|
Frank
|
3022277167 | ||
|
dank
|
689ada428f |
+17
-6
@@ -80,10 +80,21 @@ wt/
|
||||
agent/memories/--home-blank-.omp-wt-*
|
||||
|
||||
# --- theme media: content the pipeline consumes, not configuration ---------
|
||||
# 23 wallpapers, 80 MiB. Tracked until 2026-10-20; every clone of a config repo
|
||||
# was carrying a library no diff can review. The files stay on disk because
|
||||
# ~/.local/share/noctalia/wallpapers symlinks into here, and every filename
|
||||
# carries its wallhaven ID, so a fresh box restores them with
|
||||
# `curl -L -o <name> https://wallhaven.cc/w/<id>` + deploy.sh.
|
||||
# Law: omp-docs/tools/dotfiles-deploy.md
|
||||
# 23 wallpapers, 80 MiB. Tracked until 2026-10-20: every clone of a config repo was
|
||||
# carrying a library no diff can review. The live library at
|
||||
# ~/.local/share/noctalia/wallpapers is a real directory of real files (measured
|
||||
# 2026-10-20), so this path in the repo was a duplicate of it, not its source — and
|
||||
# note that untracking deletes the copy in every other checkout regardless of
|
||||
# `git rm --cached` on the branch. A fresh box starts with an empty library; every
|
||||
# filename carries its wallhaven ID, so `curl -L -o <name> https://wallhaven.cc/w/<id>`
|
||||
# puts it back. Law: omp-docs/tools/dotfiles-deploy.md
|
||||
dotfiles/noctalia/.local/share/noctalia/wallpapers/
|
||||
|
||||
# --- generated theme output: machine-written, never reviewable, never deployed ---
|
||||
# noctalia/matugen rewrite these in place; a tracked copy is a stale snapshot that
|
||||
# deploy.sh would push back over a live palette. Patterns match the exclusion list in
|
||||
# scripts/deploy.sh. Law: omp-docs/inventory/home-config-census.md, Refs #42
|
||||
dotfiles/**/themes/noctalia*
|
||||
dotfiles/**/colors/noctalia*
|
||||
dotfiles/**/noctalia.*
|
||||
dotfiles/**/noctalia-*
|
||||
|
||||
@@ -9,8 +9,6 @@ window-size=(360, -1)
|
||||
|
||||
[org/gnome/desktop/background]
|
||||
picture-options='zoom'
|
||||
picture-uri='file:///home/dank/.config/background'
|
||||
picture-uri-dark='file:///home/dank/.config/background'
|
||||
|
||||
[org/gnome/desktop/interface]
|
||||
color-scheme='prefer-dark'
|
||||
@@ -26,14 +24,6 @@ default-visible-columns=['name', 'size', 'type', 'date_modified']
|
||||
default-folder-viewer='list-view'
|
||||
migrated-gtk-settings=true
|
||||
|
||||
[org/gnome/nautilus/window-state]
|
||||
initial-size=(890, 550)
|
||||
initial-size-file-chooser=(890, 550)
|
||||
maximized=false
|
||||
|
||||
[org/gnome/portal/filechooser/firefox]
|
||||
last-folder-path='/home/dank/Downloads'
|
||||
|
||||
[org/gtk/gtk4/settings/file-chooser]
|
||||
show-hidden=false
|
||||
sort-directories-first=false
|
||||
|
||||
@@ -2,6 +2,13 @@
|
||||
Description=swayidle idle lock (locks via noctalia-shell IPC, suspends on lid)
|
||||
Documentation=https://github.com/swaywm/swayidle
|
||||
After=graphical-session.target
|
||||
# Restart together with the session, not merely at boot: this unit is wanted by
|
||||
# default.target, so a compositor restart used to leave it orphaned while the target came
|
||||
# back without it. Refs #47.
|
||||
PartOf=graphical-session.target
|
||||
# With Restart=always below, a fast failure loop must never wedge the watcher into `failed`:
|
||||
# a lock that keeps trying beats a lock that stopped trying. Refs #47.
|
||||
StartLimitIntervalSec=0
|
||||
|
||||
[Service]
|
||||
# Locks via the noctalia v5 shell; `noctalia msg` resolves the running instance
|
||||
@@ -11,7 +18,10 @@ ExecStart=/usr/bin/swayidle -w \
|
||||
timeout 300 '/usr/bin/noctalia msg session lock' \
|
||||
before-sleep '/usr/bin/noctalia msg session lock' \
|
||||
after-resume '/usr/bin/noctalia msg session lock'
|
||||
Restart=on-failure
|
||||
# `swayidle -w` exits 0 on SIGTERM, and that is how this watcher died on 2026-10-12: a clean
|
||||
# exit that `Restart=on-failure` cannot see, leaving the box unlocked for a week. A supervisor
|
||||
# restarts always. Refs #47.
|
||||
Restart=always
|
||||
RestartSec=5s
|
||||
|
||||
[Install]
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
layout {
|
||||
gaps 16 // Gap between windows
|
||||
center-focused-column "never" // Don’t auto-center focused column
|
||||
|
||||
background-color "transparent" // <- needed for noctalia-shell to set wallpaper
|
||||
|
||||
preset-column-widths {
|
||||
proportion 0.25 // 1/4
|
||||
proportion 0.3333 // 1/3
|
||||
proportion 0.5 // 1/2
|
||||
}
|
||||
|
||||
preset-window-heights {
|
||||
proportion 0.25 // 1/4
|
||||
proportion 0.5 // 1/2
|
||||
}
|
||||
|
||||
struts {
|
||||
}
|
||||
shadow
|
||||
focus-ring {
|
||||
width 2
|
||||
|
||||
active-color "#e01b24"
|
||||
}
|
||||
border {
|
||||
off
|
||||
}
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
layout {
|
||||
|
||||
focus-ring {
|
||||
active-color "#ff8c00"
|
||||
inactive-color "#181818"
|
||||
urgent-color "#ff8c00"
|
||||
}
|
||||
|
||||
border {
|
||||
active-color "#f43841"
|
||||
inactive-color "#181818"
|
||||
urgent-color "#f43841"
|
||||
}
|
||||
|
||||
|
||||
tab-indicator {
|
||||
active-color "#f43841"
|
||||
inactive-color "#74050b"
|
||||
urgent-color "#f43841"
|
||||
}
|
||||
|
||||
insert-hint {
|
||||
color "#f4384180"
|
||||
}
|
||||
}
|
||||
|
||||
recent-windows {
|
||||
highlight {
|
||||
active-color "#f43841"
|
||||
urgent-color "#f43841"
|
||||
}
|
||||
}
|
||||
@@ -83,8 +83,8 @@ by category, not file-by-file.
|
||||
| micro | 0 | 154 | adopt: `settings.json`, `bindings.json`; generated: `colorschemes/noctalia.micro`; bundled/state: `syntax/*` (146), `buffers/history` |
|
||||
| mpv | 0 | 0 | — (empty) |
|
||||
| nautilus | 0 | 0 | — (empty) |
|
||||
| niri | 9 | 1 | 8 live KDL includes (5 from `dotfiles/niri`, 3 overridden by the `zz-blankpad` tier, whose own 9 niri files are counted in that tier) + 1 tracked relic, see *Never track*. Box-only: `noctalia.kdl`, a generated include — [tools/dotfiles-deploy](/tools/dotfiles-deploy.md) |
|
||||
| noctalia | 3 | 2672 | Tracked and live-linked: `config.toml`, `palettes/Gruber Red.json`, `state/noctalia/settings.toml`. Everything else is app state plus noctalia's downloaded catalog: `community-palettes/` 66, `community-templates/` 80, `wallhaven/thumbs`, `clipboard/`, `plugins/`, `state.toml`, `usage_counts.json`. The 23 wallpapers #41 untracks stay on disk — the theme reads them |
|
||||
| niri | 8 | 2 | 8 live KDL includes (5 from `dotfiles/niri`, 3 overridden by the `zz-blankpad` tier, whose own 7 niri files are counted in that tier — the stale `layout.kdl` duplicate and generated `noctalia.kdl` were removed by #43) + see *Never track* for the relic. Box-only: `noctalia.kdl` (generated include, refused by `deploy.sh`) and the retired copy |
|
||||
| noctalia | 3 | 2672 | Tracked and live-linked: `config.toml`, `palettes/Gruber Red.json`, `state/noctalia/settings.toml`. Everything else is app state plus noctalia's downloaded catalog: `community-palettes/` 66, `community-templates/` 80, `wallhaven/thumbs`, `clipboard/`, `plugins/`, `state.toml`, `usage_counts.json`. The app's wallpaper library is `~/.local/share/noctalia/wallpapers` — real files it owns; the repo's duplicate copy of 23 JPEGs was untracked by #41 and deleted from this checkout by the merge, which is what untracking does in every checkout |
|
||||
| nvim | 0 | 0 | — (empty) |
|
||||
| pywalfox | 0 | 1 | `config.json` — program absent, prune |
|
||||
| qt5ct | 0 | 1 | `colors/noctalia.conf` (generated) — program absent, prune |
|
||||
@@ -135,7 +135,7 @@ configs).
|
||||
| Reason | Contents |
|
||||
|---|---|
|
||||
| **Generated palette expansion** | Every `themes/noctalia*`, `*/noctalia.*`, `*/colors/noctalia*` / `Noctalia*` (24 files outside app-profile dirs). Machine-written by matugen/noctalia, not hand-authored: the `stat -c '%y %n'` cluster `2026-10-14 19:05:40.330…40.813 -0700` writes 24 files in one second (`alacritty/themes/noctalia.toml` at `.330212397`, `btop/themes/noctalia.theme` at `.334212456`, `tmux/themes/noctalia.conf` at `.813219586`, …); later re-runs re-stamp singles — `bat/themes/noctalia.tmTheme` `2026-10-18 17:11:22`, `niri/noctalia.kdl` `2026-10-18 17:36:27`, `mango/noctalia.conf` `2026-10-17 18:23:37`. A same-second mass-write is generation, never an edit. |
|
||||
| **App state / profiles** | `mozilla` (5471), `unity3d` RimWorld state (235), `nirimod` (116), `obsidian` (99), `FreeTube` (56), `google-chrome-for-testing` (5); plus per-program state inside tracked dirs: `dconf/user`, `fish/fish_variables`, `micro/syntax/*`+`micro/buffers/history`, `gtk-4.0/servers`, `cachyos/cachyos-hello.log`. |
|
||||
| **App state / profiles** | `mozilla` (5471), `unity3d` RimWorld state (235), `nirimod` (116), `obsidian` (99), `FreeTube` (56), `google-chrome-for-testing` (5); plus per-program state inside tracked dirs: `dconf/user`, `fish/fish_variables`, `micro/syntax/*`+`micro/buffers/history`, `gtk-4.0/servers`, `cachyos/cachyos-hello.log`. State hides inside a tracked file too: `dconf/dump.txt` carried `last-folder-path`, a nautilus `window-state` section and `picture-uri`/`picture-uri-dark` — all `/home/dank` values, and the wallpaper URIs were live on blankpad, i.e. already deployed here — dropped by #44, see [tools/dotfiles-deploy](/tools/dotfiles-deploy.md). |
|
||||
| **Skills-CLI installs** | `crush` (37), `devin` (37), `goose` (37), `kimchi/harness` (37) skill trees — provisioned by the skills CLI, owned by the store, not this repo. See [skills/store-wiring](/skills/store-wiring.md). |
|
||||
| **Secret tier** | `~/.config/secrets/` (`gitea`, `hf_token`, `hf_token_write`, `kagi_api_key` — names only), top-level `frank-job-hunt.env`, `containers/systemd/postgres.env`. Never tracked, values never printed. |
|
||||
| **Trash committed inside the tree** | `dotfiles/niri/.config/niri/cfg/.AGENTTRASH/display.kdl.superseded` — a retired output config committed 2026-10-09, five days before `.gitignore:54` gained `.AGENTTRASH/` (2026-10-14). Tracked-then-ignored: an ignore rule never reaches an already-tracked path, so the only repair is `git rm --cached`, done by #41. The rule does match at depth — `git check-ignore --no-index -v dotfiles/niri/.config/niri/cfg/.AGENTTRASH/x` resolves to `.gitignore:54` — so a fresh in-tree trash dir is ignored from birth and this does not recur on its own. |
|
||||
|
||||
@@ -25,14 +25,16 @@ is stowed last and its files replace symlinks coming from base packages.
|
||||
| `deploy.sh` (sync) | adopt identicals, link new, quarantine divergents into `.quarantine/` and replace them |
|
||||
| `deploy.sh --adopt` | like sync, but divergents are reported and skipped rather than quarantined |
|
||||
|
||||
Two package shapes are not symlinks: `dconf/dump.txt` is loaded with `dconf load /`, and
|
||||
`systemd-user` units get `daemon-reload` plus `enable --now` only when their `ExecStart`
|
||||
binary resolves on the current machine, so a unit belonging to another box stays inert
|
||||
instead of crash-looping.
|
||||
Two package shapes are not symlinks. `dconf/dump.txt` is loaded with `dconf load /`, and
|
||||
`systemd-user` units get `daemon-reload` plus `enable`; a unit is **started** only when
|
||||
systemd reports it as nothing-yet (`""`/`disabled`), and never when its `ExecStart` binary
|
||||
is absent here, so a unit belonging to another box stays inert instead of crash-looping.
|
||||
Starting something already installed is what makes `deploy.sh` unsafe to run beside a live
|
||||
session — see *Never start a unit a session may already be running*.
|
||||
|
||||
**The tracked unit is the file, not the directory.** A live directory can be a real
|
||||
directory and still be fully tracked, because every file inside it is a symlink into the
|
||||
repo (`niri` is 9 tracked / 1 box-only; `gtk-3.0` is 3/0). Any audit that classifies by
|
||||
repo (`niri` is 8 tracked / 2 box-only; `gtk-3.0` is 3/0). Any audit that classifies by
|
||||
directory mislabels the tree — classify per file with `readlink -f`. The live census and
|
||||
its classifier command are in [home-config-census](/inventory/home-config-census.md).
|
||||
|
||||
@@ -42,14 +44,18 @@ Wallpapers live at `dotfiles/noctalia/.local/share/noctalia/wallpapers/` and are
|
||||
gitignored. They were tracked until 2026-10-20 — 23 files, 80 MiB — which meant every
|
||||
clone of a *configuration* repo carried a media library no diff can review, and the
|
||||
payload only ever grows because deleting a tracked blob from the tree does not delete it
|
||||
from history. [Noctalia](noctalia-shell.md) reads
|
||||
`~/.local/share/noctalia/wallpapers/`, which is a set of symlinks into that directory, so
|
||||
the files stay on disk and untracking them broke nothing on this box.
|
||||
from history. The topology is not what one would guess: [Noctalia](noctalia-shell.md)
|
||||
keeps its own library at `~/.local/share/noctalia/wallpapers/` as a **real directory of
|
||||
real files**, so the tracked tree was a duplicate of it and never its source — measured
|
||||
2026-10-20, when the merge of #41 deleted the repo copies and the desktop did not
|
||||
flicker. Two consequences to know before untracking media: the copy that survives belongs
|
||||
to the application, not to the repo; and untracking deletes the file in every other
|
||||
checkout, `git rm --cached` on the branch notwithstanding.
|
||||
|
||||
Restore on a fresh box: every filename is `wallhaven_<id>.<ext>` and the ID is the whole
|
||||
address — `curl -L -o <name> "https://wallhaven.cc/w/<id>"` puts the library back, then
|
||||
`deploy.sh` relinks it. Losing the set is an acceptable outcome; 80 MB per clone forever
|
||||
is not.
|
||||
Restore on a fresh box: the library lives in `~/.local/share/noctalia/wallpapers/`, a path
|
||||
`deploy.sh` does not manage. Every filename is `wallhaven_<id>.<ext>` and the ID is the
|
||||
whole address — `curl -L -o <name> "https://wallhaven.cc/w/<id>"` into that directory puts
|
||||
the set back. Losing it is an acceptable outcome; 80 MB per clone forever is not.
|
||||
|
||||
## Law: never `systemctl --user enable` a unit from a worktree
|
||||
|
||||
@@ -90,3 +96,160 @@ tracked in `dotfiles/zz-blankpad/`; the pointer is not, because which desk the b
|
||||
is not a fact about the repo. A fresh box therefore starts with no output configuration —
|
||||
`config.kdl` includes `display.kdl` with `optional=true`, so niri comes up usable but with
|
||||
default monitors until `desk.sh` is run once.
|
||||
|
||||
## Law: generated theme output is never deployed
|
||||
|
||||
noctalia rewrites palette output in place — `noctalia.*`, `themes/noctalia*`,
|
||||
`colors/noctalia*`, `noctalia-*` (the classes the [census](/inventory/home-config-census.md)
|
||||
proves by same-millisecond mtime). A tracked copy of one is a stale snapshot of a colour
|
||||
scheme, and the failure is quiet: `dotfiles/zz-blankpad/niri/.config/niri/noctalia.kdl`
|
||||
(commit `b3d3df4`, 2026-10-18) sat byte-identical to the live file for two days, harmless,
|
||||
while `--check` cheerfully proposed `ADOPT … noctalia.kdl`. The moment the palette changed,
|
||||
the next sync would have quarantined the live file and restored 2026-10-18's colours —
|
||||
a tool silently reverting a user-visible theme choice.
|
||||
|
||||
`deploy.sh` now refuses the class (`SKIP … (generated theme output)`), `.gitignore` carries
|
||||
the matching patterns so it cannot be re-added, and `tests/deploy.bats` pins both
|
||||
directions: generated output is never adopted, and an ordinary identical config still is.
|
||||
Untracked in #43, Refs #42.
|
||||
|
||||
## Law: a `zz` override older than the file it overrides is a time bomb
|
||||
|
||||
Stow order means `zz-$HOST` wins, and when both packages carry the same path, sync relinks
|
||||
it *silently* — the script's own comment: "managed file changing owners between packages:
|
||||
silent relink, nothing to quarantine". `dotfiles/zz-blankpad/niri/.config/niri/cfg/layout.kdl`
|
||||
held focus ring `width 2` / `active-color "#e01b24"` from `7b7dbf5` (2026-10-17) while the
|
||||
base package absorbed `b3d3df4` (2026-10-18): `width 4`, `"#ff8c00"`. Live was linked to
|
||||
base, the newer intent, so `--check` printed `RELINK .config/niri/cfg/layout.kdl` on every
|
||||
run and one unattended `deploy.sh` would have reverted the amber focus ring with no
|
||||
quarantine and no warning. The duplicate is deleted in #43.
|
||||
|
||||
Rule: a `zz` file exists only to differ. When base absorbs the change, delete the `zz` copy
|
||||
in the same commit.
|
||||
|
||||
How to read `--check`, measured on blankpad: it prints `RELINK` for **every** path the `zz`
|
||||
tier carries, even when the live link already points at the override — `rules.kdl`,
|
||||
`keybinds.kdl`, `misc.kdl`, `autostart.kdl` and `.zshrc` all did — because the walk
|
||||
processes the base package first and reports the intermediate owner change. A `RELINK` line
|
||||
therefore proves a pending change only when `readlink` shows the live target is *not*
|
||||
already the `zz-$HOST` file. `actions=0` is the only honest summary.
|
||||
## Law: never start a unit a session may already be running
|
||||
|
||||
`sync` used to end with `systemctl --user enable --now` for every unit in `systemd-user/`
|
||||
whose `ExecStart` resolves. Measured on blankpad before one such run:
|
||||
|
||||
|unit|`UnitFileState`|`ActiveState`|
|
||||
|---|---|---|
|
||||
|`live-sync.service`|`linked`|`inactive`|
|
||||
|`shelly-notifications.service`|`enabled`|`active`|
|
||||
|`swayidle-lock.service`|`enabled`|`inactive`|
|
||||
|
||||
`swayidle-lock.service` was installed and **not running** — nothing started it, no swayidle
|
||||
process existed (`pgrep -c swayidle` = 0), and `autostart.kdl` does not launch one. A
|
||||
`deploy.sh` run would have armed it: monitors blanking and locking on the idle timer while
|
||||
the operator was mid-sentence. `live-sync.service` is `linked`, driven by its timer;
|
||||
`--now` forces a heartbeat commit at an arbitrary moment.
|
||||
|
||||
Two rules follow. Install state must be read from the **printed state**, not the exit
|
||||
status — `is-enabled` exits 1 for `linked` exactly as for `disabled`, so exit status cannot
|
||||
tell "installed, driven by a timer" apart from "never installed". And a unit is started only
|
||||
in the latter case: a machine with a session on it has already decided what runs, while a
|
||||
fresh box — where everything reports `disabled` — still gets its units up. Both directions
|
||||
are pinned in `tests/deploy.bats` over a stub `systemctl`, because the real one on this box
|
||||
is exactly what must not be invoked from a test. Refs #44.
|
||||
|
||||
## Law: expand systemd specifiers before calling a unit foreign
|
||||
|
||||
`ExecStart=%h/.omp/scripts/live-sync.sh` is valid systemd and meaningless to a shell. The
|
||||
resolution check handed that literal string to `command -v`, which fails everywhere, so the
|
||||
deployment concluded the unit belonged to another machine and skipped it — silently, through
|
||||
the same code path that is supposed to keep a *foreign* unit inert. The unit it kept skipping
|
||||
was this repo's own heartbeat, and `%h` is precisely where this checkout lives, so the false
|
||||
verdict was the same on every box that deployed it. Measured on blankpad: the first real
|
||||
`deploy.sh` run printed `SKIP live-sync.service (ExecStart '%h/.omp/scripts/live-sync.sh'
|
||||
absent on this host)` while `/home/blank/.omp/scripts/live-sync.sh` sits right there.
|
||||
|
||||
Expand the specifiers a user unit can carry — `%h`, `%u`, `%U` — before resolving, and let an
|
||||
unknown specifier fail rather than guess at it. The probe needs no privileges and writes
|
||||
nothing:
|
||||
|
||||
```bash
|
||||
bin=$(sed -n 's/^ExecStart=\([^ ]*\).*/\1/p' \
|
||||
~/.omp/dotfiles/systemd-user/.config/systemd/user/live-sync.service | head -1)
|
||||
command -v "${bin//%h/$HOME}" # resolves → the unit is this box's; the SKIP was the lie
|
||||
```
|
||||
|
||||
## Law: the dconf dump holds preferences, not per-box state
|
||||
|
||||
`dconf load /` writes every key in `dotfiles/dconf/dump.txt`, so the dump carries whatever
|
||||
box it was taken from. Comparing key by key against live state on blankpad found **six of
|
||||
24** keys that were not this box's, and not one of them was a preference:
|
||||
|
||||
[org/gnome/portal/filechooser/firefox] last-folder-path
|
||||
repo: '/home/dank/Downloads' live: '/home/blank/Downloads'
|
||||
[org/gnome/nautilus/window-state] initial-size, initial-size-file-chooser, maximized
|
||||
[org/gnome/desktop/background] picture-uri, picture-uri-dark
|
||||
both: 'file:///home/dank/.config/background'
|
||||
|
||||
A file-chooser memory, a window geometry, a wallpaper URI: application state that arrived
|
||||
with the dotfiles import. The last five did not appear as conflicts at all, because
|
||||
blankpad's **live** tree already held the same `/home/dank` values — an earlier deploy had
|
||||
written them here. A foreign value that agrees with live is invisible to any diff and still
|
||||
wrong. All six come out in #44; the two wallpaper URIs are also cleared on this box
|
||||
(`gsettings set org.gnome.desktop.background picture-uri ''`, and its `-dark` twin), because
|
||||
niri draws the wallpaper, noctalia owns it, and nothing reads a dead path.
|
||||
|
||||
Compare **key by key**, not with a plain `diff`: `dconf load` writes only the keys present,
|
||||
so live-only keys survive and a diff overstates the damage in one direction and understates
|
||||
it in the other. Re-dump on the box whose settings are canonical (`dconf dump / >
|
||||
dotfiles/dconf/dump.txt`), then delete the state sections before committing — the census's
|
||||
*Never track: app state* class applies inside a tracked file, not just to whole directories.
|
||||
Refs #44.
|
||||
|
||||
## Law: a watcher must restart on a clean exit too
|
||||
|
||||
`swayidle-lock.service` was `enabled`, present in `default.target.wants/`, and **dead for eight
|
||||
days**: `Result=success`, `NRestarts=0`, gone since 2026-10-12 16:22 after 2d 21h of uptime.
|
||||
`Restart=on-failure` cannot see a clean exit, and `swayidle -w` exits 0 on SIGTERM. The trigger is
|
||||
attributable to eight seconds: **`niri` and `noctalia` both started `Mon Oct 12 16:22:31 2026`**
|
||||
(`ps -o lstart=`) while swayidle's last state change was `16:22:23` — the compositor session
|
||||
restarted, the watcher went with it, and because it was wanted by `default.target` rather than tied
|
||||
to the session target, nothing brought it back. The user journal keeps no entries for that window,
|
||||
so the attribution rests on process ages rather than logs, which is its own lesson: diagnose a
|
||||
lapse within the retention you actually have.
|
||||
|
||||
**The severity claim in this page's first draft was wrong, and is corrected here.** It said closing
|
||||
the lid suspended the machine unlocked, because the `before-sleep` hook lived in the dead unit. But
|
||||
`systemd-inhibit --list` shows `noctalia … sleep "Lock before sleep" delay` — the shell holds its
|
||||
own sleep inhibitor and locks on suspend independently of swayidle, so the suspend path was covered
|
||||
the whole time. What was actually dead for eight days is the **idle** lock: five minutes of
|
||||
inactivity locked nothing, and `after-resume` never fired. `pgrep -c -u blankpad
|
||||
'swayidle|swaylock|hyprlock|gtklock'` = 0 remains true; it simply did not mean *no lock path at
|
||||
all*, because a locker can be a hook inside a running shell rather than a name on the process list.
|
||||
Read the inhibitor table, not only `pgrep`.
|
||||
|
||||
Three settings, each with a job: `Restart=always`, because a supervisor must not assume it can
|
||||
only die badly; `StartLimitIntervalSec=0`, because a fast loop must never wedge it into `failed` —
|
||||
a lock that keeps trying beats one that stopped trying; and `PartOf=graphical-session.target`,
|
||||
because the unit is wanted by `default.target`, so the session coming back did not bring *it*
|
||||
back.
|
||||
|
||||
Verify by behaviour rather than by reading the file — the point is surviving the event that killed
|
||||
it in October:
|
||||
|
||||
```bash
|
||||
systemctl --user start swayidle-lock.service
|
||||
kill -TERM "$(systemctl --user show swayidle-lock.service -p MainPID --value)"
|
||||
sleep 8 && systemctl --user show swayidle-lock.service -p NRestarts -p MainPID -p ActiveState
|
||||
```
|
||||
|
||||
An idle inhibitor also disarms the timeout outright, which surprises people: while an `omp` agent
|
||||
session is running, swayidle logs `Not enabling timeouts: idle inhibitor found` and arms no idle
|
||||
timeout at all — `systemd-inhibit --list` shows `omp … idle "omp agent session" block`. A box with
|
||||
an agent working therefore does not lock on inactivity, by harness design, while `before-sleep` and
|
||||
`after-resume` keep working. Anyone asking "why did the screen never lock" should read the inhibitor
|
||||
table before suspecting the unit.
|
||||
|
||||
The general shape: `deploy.sh` only ever *enables*. Nothing on any box re-checks that a unit the
|
||||
system depends on is still running, so a security posture can lapse silently and stay lapsed for a
|
||||
week. A liveness check for this tier belongs in the heartbeat, not in a human's memory. Refs #47.
|
||||
|
||||
@@ -19,6 +19,7 @@ Configuration guides and reference material for installed software. Each tool ha
|
||||
* [neovim](neovim.md) — Two editors in one binary: vanilla `nvim` for quick edits and the `lazyvim` NVIM_APPNAME profile, with the base16 wallpaper-palette hook and fresh-box install.
|
||||
* [niri](niri/index.md) — Scrollable-tiling Wayland compositor — configuration, keybindings, and architecture for the workstation.
|
||||
* [noctalia-shell](noctalia-shell.md) — Native desktop environment for Niri — launcher, control center, settings, lock screen, session menu, hotkey overlay, media controls, and system management.
|
||||
* [packages](packages.md) — `packages/*.pkgs` desired state and the two tools that keep a machine and its manifest agreeing: `install.sh` installs the delta, `pkg-inventory.sh` reports what the machine has outgrown.
|
||||
* [tmux](tmux.md) — Terminal multiplexer configuration, extended-keys setup, keyboard input best practices, and reload/restart procedures.
|
||||
|
||||
## Adding a New Tool
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
---
|
||||
type: reference
|
||||
title: package desired state
|
||||
description: packages/*.pkgs plus the two tools that keep a machine and its manifest agreeing — install.sh installs desired-minus-installed, pkg-inventory.sh reports installed-minus-declared.
|
||||
tags:
|
||||
- packages
|
||||
- pacman
|
||||
- provisioning
|
||||
- fleet
|
||||
- blankpad
|
||||
verified: 2026-10-20
|
||||
timestamp: 2026-10-20
|
||||
---
|
||||
|
||||
# Package desired state
|
||||
|
||||
Two tools, one invariant: **the manifests must describe the machine.** A rebuild is only faithful
|
||||
if both directions are checked.
|
||||
|
||||
|tool|direction|writes|
|
||||
|---|---|---|
|
||||
|`scripts/install.sh`|desired → installed|installs `desired − installed` with `--apply`; never removes|
|
||||
|`scripts/pkg-inventory.sh`|installed → declared|nothing — read-only report|
|
||||
|
||||
## Manifests
|
||||
|
||||
`packages/common.pkgs` (every host) + `packages/<host>.pkgs` (this host) + `packages/aur.pkgs`
|
||||
(AUR-only, installed through `yay`). The parser is `sed 's/#.*//'` then the first field, so `#`
|
||||
comments trail freely and one token per line is the whole grammar. An unknown `--host` gets the
|
||||
common manifest only: a wrong-host run is a no-op, not a hazard.
|
||||
|
||||
## Rebuild a workstation
|
||||
|
||||
1. Install the OS (CachyOS, niri/noctalia profile). The installer's own package set is *not* in the
|
||||
manifests and must not be — see the baseline law below.
|
||||
2. Clone this repo to `~/.omp`, then `scripts/install.sh --apply` — packages first, because the
|
||||
enablement step needs `sshd` and `firewalld` present ([dotfiles-deploy](dotfiles-deploy.md)).
|
||||
3. `scripts/deploy.sh sync` for the config tier ([dotfiles-deploy](dotfiles-deploy.md)).
|
||||
4. `scripts/pkg-inventory.sh --emit` on a *known-good* machine and fold the output into
|
||||
`packages/<host>.pkgs` / `packages/aur.pkgs` before step 2 — that is how a hand install stops
|
||||
being invisible to the next rebuild.
|
||||
|
||||
## pkg-inventory report
|
||||
|
||||
```
|
||||
undeclared additions (declare these): N ← exit 1 when N > 0
|
||||
repo (sync dbs): <names> → belongs in packages/<host>.pkgs
|
||||
aur (needs a helper): <names> → belongs in packages/aur.pkgs
|
||||
installer-provided, undeclared: N + names → a reinstall supplies these; do not declare
|
||||
declared, not installed: <names> → install.sh installs these
|
||||
orphans ignored: <names> → pacman -Qtdq
|
||||
flatpak: <app ids> → reported only, install.sh installs no flatpaks
|
||||
```
|
||||
|
||||
Exit codes: `0` clean · `1` drift · `2` usage · `3` classification impossible. Overrides
|
||||
`PKGINV_REPO` / `PKGINV_HOST` / `PKGINV_LOG` / `PKGINV_BASELINE` exist for tests.
|
||||
|
||||
## Law: the installer's own day is the baseline
|
||||
|
||||
Whether a package is *yours* is decided by the pacman log, not by opinion: the baseline date is the
|
||||
oldest `[ALPM] installed` entry — Calamares' pacstrap — and everything installed **on or before** it
|
||||
is installer furniture. Without that cut, a base install reports several hundred "additions" and the
|
||||
list nobody can act on is worse than no list.
|
||||
|
||||
- **Read the rotated logs too** (`pacman.log.N`, `.N.gz`). On a machine older than the rotation
|
||||
window the install day exists only there; skip them and the whole base system is reported as
|
||||
hand-installed.
|
||||
- Calamares keeps installing the desktop for minutes after the base transaction, which is why the
|
||||
date cut is inclusive.
|
||||
|
||||
## Law: refuse rather than guess the AUR split
|
||||
|
||||
`aur.pkgs` vs `<host>.pkgs` is decided by whether any sync database can serve the name — Chaotic-AUR
|
||||
counts as a sync database, so only true AUR belongs in `aur.pkgs`. If the sync databases are
|
||||
unavailable the tool exits `3` instead of assuming: guessing sends every package to `yay`, which is
|
||||
how a manifest becomes a pile of source builds.
|
||||
|
||||
Classify with `pacman -Sl` (world-readable). **`pacman -Sqq` requires root** — a tool that only
|
||||
reads the machine must not need sudo to answer a question about it.
|
||||
|
||||
**Known gap:** `aur.pkgs` is read for *every* host, so a desktop-only AUR package (a niri module, a
|
||||
GUI client) cannot be declared there without asking the headless servers to build it. Such a name is
|
||||
still reported as an AUR addition; leave it undeclared until `install.sh` grows a per-host AUR
|
||||
manifest.
|
||||
|
||||
## Law: orphans never reach a manifest
|
||||
|
||||
`pacman -Qtdq` names are packages nothing depends on; emitting them would teach a fresh machine to
|
||||
install the same dead weight. They are printed as `orphans ignored` and excluded from `--emit`.
|
||||
|
||||
## Two traps that produced this tool
|
||||
|
||||
- **`set -o pipefail` plus `head -1`**: `head` closes the pipe, `sort` dies of `SIGPIPE`, the
|
||||
substitution returns `141`, and `set -e` aborts the script. It survives a small test fixture and
|
||||
fails on a real 1000-line install-day log — take a minimum in one pass (`awk 'END'`-style), never
|
||||
sort-then-first. The same applies to `awk 'NR==1{exit}'`, which closes the pipe exactly as `head`
|
||||
does.
|
||||
- **`tr '\n' ' '` swallows the final newline** and `fold` faithfully preserves that absence, so the
|
||||
next report label lands on the same line as the last name. `tr '\n' ' '; echo` instead.
|
||||
|
||||
## Related
|
||||
|
||||
- [tools/index](index.md) · [dotfiles-deploy](dotfiles-deploy.md) (the config tier that follows) ·
|
||||
[live-sync](live-sync.md) (the heartbeat that commits machine state)
|
||||
- Tests: `tests/pkg-inventory.bats` (fixtures + stubbed `pacman`, no real package database touched).
|
||||
- Refs #51.
|
||||
@@ -3,3 +3,35 @@
|
||||
# pkgbase amd-ucode (split pkgname amd-ucode). No module options needed.
|
||||
|
||||
amd-ucode
|
||||
|
||||
# Hand-installed additions, measured by scripts/pkg-inventory.sh on 2026-10-20 against the
|
||||
# Calamares install day (baseline 2026-09-07). These stay out of common.pkgs: none of them belong
|
||||
# on the headless servers. install.sh installs them only where they are missing, so this list
|
||||
# changes nothing on the running box — it is what makes the next rebuild faithful.
|
||||
bun
|
||||
cachyos-gaming-applications
|
||||
curlftpfs
|
||||
flatpak
|
||||
fuse2
|
||||
fuseiso
|
||||
ghostty-nautilus
|
||||
glow
|
||||
gnome-calculator
|
||||
gnome-disk-utility
|
||||
nodejs
|
||||
npm
|
||||
obsidian
|
||||
partitionmanager
|
||||
plezy
|
||||
proton-mail-bin
|
||||
python-yaml
|
||||
quickshell
|
||||
shelly-flatpak-backend
|
||||
sshfs
|
||||
tmux
|
||||
ttf-proggyclean-nerd
|
||||
ttf-terminus-nerd
|
||||
wine-cachyos
|
||||
|
||||
# nirimod-git is an AUR addition deliberately left undeclared: aur.pkgs is read by every host, and
|
||||
# a niri module must not be built on the servers. See the known gap in omp-docs/tools/packages.md.
|
||||
|
||||
+30
-2
@@ -44,6 +44,14 @@ actions=0; quarantined=0; skipped=0
|
||||
|
||||
deploy_file() { # $1 = repo file path, $2 = home-relative target path
|
||||
local src="$1" tgt="$HOME/$2"
|
||||
# Generated theme output is never deployment state: noctalia rewrites these files in
|
||||
# place, so a tracked copy is a stale snapshot and syncing one reverts a live palette to
|
||||
# the colours of the day it was committed. Classes are those the census measures by
|
||||
# mtime — see omp-docs/inventory/home-config-census.md, "Generated palette expansion".
|
||||
case "$2" in
|
||||
*/themes/noctalia*|*/colors/noctalia*|*/noctalia.*|*/noctalia-*|*/Noctalia*)
|
||||
echo "SKIP $2 (generated theme output)"; skipped=$((skipped+1)); return 0 ;;
|
||||
esac
|
||||
if [ -L "$tgt" ]; then
|
||||
if [ "$(realpath "$tgt")" = "$(realpath "$src")" ]; then return 0; fi # already deployed
|
||||
case "$MODE" in
|
||||
@@ -115,9 +123,29 @@ if [ "$MODE" != "check" ] && [ -d "$PKGS_DIR/systemd-user/.config/systemd/user"
|
||||
for unit in "$PKGS_DIR"/systemd-user/.config/systemd/user/*.service; do
|
||||
[ -e "$unit" ] || continue
|
||||
bin="$(sed -n 's/^ExecStart=\([^ ]*\).*/\1/p' "$unit" | head -1)"
|
||||
# systemd expands specifiers inside ExecStart; this shell does not. Matching the literal
|
||||
# `%h/…` makes a unit of THIS box look foreign and skips it in silence — which is exactly
|
||||
# how live-sync.service, the repo's own heartbeat, has been reported "absent on this
|
||||
# host" on every machine that deployed it. Expand what a user unit can carry; leave any
|
||||
# other specifier unmatched rather than guess at it. Refs #44.
|
||||
bin="${bin//%h/$HOME}"
|
||||
bin="${bin//%u/$(id -un)}"
|
||||
bin="${bin//%U/$(id -u)}"
|
||||
if [ -n "$bin" ] && command -v "$bin" >/dev/null 2>&1; then
|
||||
systemctl --user enable --now "$(basename "$unit")" || true
|
||||
echo "ENABLE $(basename "$unit") (ExecStart resolves here)"
|
||||
name="$(basename "$unit")"
|
||||
# Read the state, not the exit status: `is-enabled` exits 1 for a `linked` unit exactly
|
||||
# as for a `disabled` one. Starting something already installed is how a deploy locks a
|
||||
# live session — swayidle-lock sits enabled/inactive on blankpad and `--now` arms it
|
||||
# mid-conversation. Only a unit nothing has installed yet gets started. Refs #44.
|
||||
state="$(systemctl --user is-enabled "$name" 2>/dev/null || true)"
|
||||
case "$state" in
|
||||
"" | disabled)
|
||||
systemctl --user enable --now "$name" || true
|
||||
echo "ENABLE $name (ExecStart resolves here; nothing running it yet)" ;;
|
||||
*)
|
||||
systemctl --user enable "$name" || true
|
||||
echo "ENABLE $name (already $state; not started — a live session decides what runs)" ;;
|
||||
esac
|
||||
else
|
||||
echo "SKIP $(basename "$unit") (ExecStart '$bin' absent on this host)"
|
||||
fi
|
||||
|
||||
Executable
+159
@@ -0,0 +1,159 @@
|
||||
#!/usr/bin/env bash
|
||||
# scripts/pkg-inventory.sh — what does this machine have that packages/*.pkgs does not declare?
|
||||
#
|
||||
# install.sh walks desired → installed. This walks installed → declared, and the pair is what
|
||||
# makes a rebuild honest: a manifest the machine has quietly outgrown reproduces a machine that
|
||||
# is missing the tools you installed by hand six weeks ago, and nothing notices until the new box
|
||||
# has no tmux. Refs #51.
|
||||
#
|
||||
# The baseline is what separates "you installed this" from "the installer installed this". It is
|
||||
# read from the pacman log — the install-day transactions, dated at the oldest `[ALPM] installed`
|
||||
# line — because declaring Calamares furniture in a manifest is bookkeeping for something a
|
||||
# reinstall provides for free. Rotated logs (pacman.log.N, .N.gz) are read too: on a machine older
|
||||
# than the rotation window the install day lives only there, and skipping them would report the
|
||||
# entire base system as hand-installed.
|
||||
#
|
||||
# Report (stdout):
|
||||
# undeclared additions (declare these): N hand-installed, absent from the manifests
|
||||
# repo (sync dbs): <names> → belongs in packages/<host>.pkgs
|
||||
# aur (needs a helper): <names> → belongs in packages/aur.pkgs (yay)
|
||||
# installer-provided, undeclared: N a reinstall supplies these; do not declare
|
||||
# declared, not installed: N install.sh installs these
|
||||
# orphans ignored: <names> pacman -Qtdq — never emitted
|
||||
# flatpak: <app ids> reported only, install.sh installs no flatpaks
|
||||
#
|
||||
# --emit prints the additions as manifest lines, ready to fold into packages/. Names are bare
|
||||
# tokens so install.sh's `sed 's/#.*//'` + first-field parser reads them unchanged.
|
||||
#
|
||||
# Exit status: 0 clean · 1 drift (undeclared additions exist) · 2 usage · 3 cannot classify
|
||||
# (pacman log unreadable or sync databases unavailable — worse to guess than to say so, because
|
||||
# guessing would dump every package into aur.pkgs).
|
||||
#
|
||||
# Environment overrides (tests):
|
||||
# PKGINV_REPO repo root holding packages/ (default: git toplevel of this script)
|
||||
# PKGINV_HOST host name (default: $(hostname))
|
||||
# PKGINV_LOG space-separated pacman logs (default: /var/log/pacman.log + rotated)
|
||||
# PKGINV_BASELINE YYYY-MM-DD, inclusive (default: oldest install date in the logs)
|
||||
|
||||
set -euo pipefail
|
||||
export LC_ALL=C # comm/sort agreement: pacman's order is not this order
|
||||
|
||||
MODE="report"
|
||||
while [[ $# -gt 0 ]]; do
|
||||
case "$1" in
|
||||
--emit) MODE="emit"; shift ;;
|
||||
-h | --help) sed -n '2,40p' "$0"; exit 0 ;;
|
||||
*) echo "usage: pkg-inventory.sh [--emit]" >&2; exit 2 ;;
|
||||
esac
|
||||
done
|
||||
|
||||
REPO="${PKGINV_REPO:-}"
|
||||
if [[ -z "$REPO" ]]; then
|
||||
REPO="$(git -C "$(dirname "$(realpath "$0")")" rev-parse --show-toplevel 2>/dev/null || true)"
|
||||
fi
|
||||
[[ -n "$REPO" && -d "$REPO/packages" ]] || { echo "pkg-inventory: no packages/ under ${REPO:-<repo>}" >&2; exit 2; }
|
||||
HOST="${PKGINV_HOST:-$(hostname)}"
|
||||
|
||||
TMP="$(mktemp -d)"; trap 'rm -rf "$TMP"' EXIT
|
||||
|
||||
read_manifest() { # same parser install.sh uses, so a name means the same thing to both
|
||||
sed 's/#.*//' "$1" | tr -d '\r' | awk '{if ($1) print $1}'
|
||||
}
|
||||
# ---- installed state ---------------------------------------------------------
|
||||
# Four queries are the tool's whole interface to pacman. -Sl is the unprivileged sync listing:
|
||||
# -Sqq asks for root, and a read of the machine must not need sudo. Field 2 of -Sl is the package
|
||||
# name, and one name can appear in several databases (core/extra/cachyos), hence the sort -u.
|
||||
pacman -Qqe > "$TMP/explicit"
|
||||
pacman -Qq > "$TMP/installed"
|
||||
pacman -Qtdq > "$TMP/orphans" 2>/dev/null || true # exit 1 when the list is empty: no orphans
|
||||
if ! pacman -Sl > "$TMP/sync.raw" 2>/dev/null || [[ ! -s "$TMP/sync.raw" ]]; then
|
||||
echo "pkg-inventory: no sync database available (run: sudo pacman -Sy) — repo vs AUR cannot be classified" >&2
|
||||
exit 3
|
||||
fi
|
||||
awk '{print $2}' "$TMP/sync.raw" | sort -u > "$TMP/sync"
|
||||
|
||||
# ---- declared desired state --------------------------------------------------
|
||||
: > "$TMP/declared"
|
||||
for m in common.pkgs "$HOST.pkgs" aur.pkgs; do
|
||||
[[ -f "$REPO/packages/$m" ]] || continue
|
||||
read_manifest "$REPO/packages/$m" >> "$TMP/declared"
|
||||
done
|
||||
|
||||
# ---- baseline: what the installer put here -----------------------------------
|
||||
logs=()
|
||||
if [[ -n "${PKGINV_LOG:-}" ]]; then
|
||||
read -ra logs <<< "$PKGINV_LOG"
|
||||
else
|
||||
logs=(/var/log/pacman.log)
|
||||
for f in /var/log/pacman.log.[0-9]*; do [[ -e "$f" ]] && logs+=("$f"); done
|
||||
fi
|
||||
read_logs() {
|
||||
local f
|
||||
for f in "${logs[@]}"; do
|
||||
[[ -r "$f" ]] || continue
|
||||
case "$f" in *.gz) zcat "$f" ;; *) cat "$f" ;; esac
|
||||
done
|
||||
}
|
||||
# "YYYY-MM-DD name" for every install event the log remembers.
|
||||
read_logs | sed -nE 's/^\[([0-9-]{10})T[^]]*\] \[ALPM\] installed ([^ ]+) \(.*/\1 \2/p' > "$TMP/events"
|
||||
[[ -s "$TMP/events" ]] || { echo "pkg-inventory: no install events readable in ${logs[*]} — baseline unknown" >&2; exit 3; }
|
||||
|
||||
# Minimum date in a single awk pass. Sorting and then taking the first line — whether with `head`
|
||||
# or with an awk that exits early — closes the pipe, and pipefail turns sort's SIGPIPE into a dead
|
||||
# script; a real install-day log is long enough for that to bite (it killed the first real run).
|
||||
BASELINE="${PKGINV_BASELINE:-$(awk '{ if (m == "" || $1 < m) m = $1 } END { print m }' "$TMP/events")}"
|
||||
[[ "$BASELINE" =~ ^[0-9]{4}-[0-9]{2}-[0-9]{2}$ ]] || { echo "pkg-inventory: bad PKGINV_BASELINE '$BASELINE' (want YYYY-MM-DD)" >&2; exit 2; }
|
||||
|
||||
# Inclusive: packages installed ON the baseline date came with the install too — Calamares keeps
|
||||
# installing the desktop for minutes after the base transaction.
|
||||
awk -v d="$BASELINE" '$1 <= d {print $2}' "$TMP/events" | sort -u > "$TMP/base"
|
||||
|
||||
for f in explicit installed sync declared base orphans; do sort -u -o "$TMP/$f" "$TMP/$f"; done
|
||||
|
||||
# ---- the sets ----------------------------------------------------------------
|
||||
# additions: explicit, not declared, and not something the installer handed us.
|
||||
comm -23 "$TMP/explicit" "$TMP/declared" > "$TMP/undeclared"
|
||||
comm -23 "$TMP/undeclared" "$TMP/base" > "$TMP/additions"
|
||||
comm -12 "$TMP/undeclared" "$TMP/base" > "$TMP/installside"
|
||||
comm -12 "$TMP/additions" "$TMP/sync" > "$TMP/add.repo"
|
||||
comm -23 "$TMP/additions" "$TMP/sync" > "$TMP/add.aur"
|
||||
comm -23 "$TMP/declared" "$TMP/installed" > "$TMP/missing"
|
||||
|
||||
n() { wc -l < "$1" | tr -d ' '; }
|
||||
|
||||
if [[ "$MODE" == emit ]]; then
|
||||
if [[ -s "$TMP/add.repo" ]]; then
|
||||
printf '# packages/%s.pkgs — additions measured %s (pkg-inventory.sh, baseline %s)\n' \
|
||||
"$HOST" "$(date +%F)" "$BASELINE"
|
||||
cat "$TMP/add.repo"
|
||||
fi
|
||||
if [[ -s "$TMP/add.aur" ]]; then
|
||||
printf '# packages/aur.pkgs — additions measured %s (AUR: not in any sync db, install via yay)\n' \
|
||||
"$(date +%F)"
|
||||
cat "$TMP/add.aur"
|
||||
fi
|
||||
exit 0
|
||||
fi
|
||||
|
||||
printf 'pkg-inventory host=%s baseline=%s repo=%s\n' "$HOST" "$BASELINE" "$REPO"
|
||||
printf 'counts declared=%s explicit=%s baseline=%s installed=%s\n' \
|
||||
"$(n "$TMP/declared")" "$(n "$TMP/explicit")" "$(n "$TMP/base")" "$(n "$TMP/installed")"
|
||||
printf 'undeclared additions (declare these): %s\n' "$(n "$TMP/additions")"
|
||||
printf ' repo (sync dbs): %s\n' "$(tr '\n' ' ' < "$TMP/add.repo")"
|
||||
printf ' aur (needs a helper): %s\n' "$(tr '\n' ' ' < "$TMP/add.aur")"
|
||||
printf 'installer-provided, undeclared (a reinstall provides these): %s\n' "$(n "$TMP/installside")"
|
||||
# The names, folded: this is the answer to "what did the installer mark explicit that I never
|
||||
# declared", and it is long — a count alone would force a second run to see it.
|
||||
# The echo matters: tr eats the final newline, fold preserves that absence, and the next label
|
||||
# would otherwise be glued to the last folded line.
|
||||
{ tr '\n' ' ' < "$TMP/installside"; echo; } | fold -s -w 88 | sed 's/^/ /'
|
||||
printf 'declared, not installed (install.sh installs these): %s\n' "$(tr '\n' ' ' < "$TMP/missing")"
|
||||
printf 'orphans ignored (pacman -Qtdq): %s\n' "$(tr '\n' ' ' < "$TMP/orphans")"
|
||||
if command -v flatpak > /dev/null 2>&1 && flatpak list --app --columns=application > "$TMP/flatpak" 2>/dev/null; then
|
||||
printf 'flatpak (reported only; install.sh installs no flatpaks): %s\n' "$(tr '\n' ' ' < "$TMP/flatpak")"
|
||||
else
|
||||
printf 'flatpak: not installed on this host\n'
|
||||
fi
|
||||
|
||||
[[ -s "$TMP/additions" ]] && exit 1
|
||||
exit 0
|
||||
Executable
+154
@@ -0,0 +1,154 @@
|
||||
#!/usr/bin/env bats
|
||||
# tests/deploy.bats — black-box tests for scripts/deploy.sh (Refs #42)
|
||||
#
|
||||
# Contract (see script header): the repo checkout IS the deployment; sync adopts
|
||||
# identicals, links new files, quarantines-and-replaces divergents, and stows the
|
||||
# zz-$(hostname) package last. One thing it must NEVER do is deploy generated theme
|
||||
# output: noctalia rewrites `noctalia.*` / `themes/noctalia*` in place, so a tracked
|
||||
# copy is a stale snapshot, and a sync would revert a live palette to whatever colour
|
||||
# scheme was current on the day it was committed.
|
||||
#
|
||||
# Nothing is observed except exit status, stdout, the file/symlink shape under $HOME,
|
||||
# and the quarantine directory.
|
||||
|
||||
setup() {
|
||||
TEST_TMP="$(mktemp -d)"
|
||||
REPO="$TEST_TMP/repo"
|
||||
DEPLOY="$BATS_TEST_DIRNAME/../scripts/deploy.sh"
|
||||
mkdir -p "$REPO/scripts" "$REPO/dotfiles"
|
||||
# A git repo, because the deployment checkout IS one and deploy.sh arms hooksPath.
|
||||
git init -q -b main "$REPO"
|
||||
cp "$DEPLOY" "$REPO/scripts/deploy.sh"
|
||||
chmod +x "$REPO/scripts/deploy.sh"
|
||||
export HOME="$TEST_TMP/home"
|
||||
mkdir -p "$HOME"
|
||||
export DEPLOY_REPO="$REPO" DEPLOY_HOST=box
|
||||
|
||||
# systemctl stub: records every call and answers is-enabled from a file. The real
|
||||
# systemctl must never run here — on this box it would start a screen lock.
|
||||
mkdir -p "$TEST_TMP/bin"
|
||||
export STUB_LOG="$TEST_TMP/systemctl.log" UNIT_STATE="$TEST_TMP/unit-state"
|
||||
: > "$STUB_LOG"
|
||||
cat > "$TEST_TMP/bin/systemctl" <<'STUB'
|
||||
#!/usr/bin/env bash
|
||||
echo "systemctl $*" >> "$STUB_LOG"
|
||||
if [ "$2" = is-enabled ]; then
|
||||
state="$(cat "$UNIT_STATE" 2>/dev/null || echo disabled)"
|
||||
printf '%s\n' "$state"
|
||||
case "$state" in disabled | "") exit 1 ;; *) exit 0 ;; esac
|
||||
fi
|
||||
exit 0
|
||||
STUB
|
||||
chmod +x "$TEST_TMP/bin/systemctl"
|
||||
export PATH="$TEST_TMP/bin:$PATH"
|
||||
}
|
||||
|
||||
teardown() { rm -rf "$TEST_TMP"; }
|
||||
|
||||
# repo_file <pkg-relative path> <content>
|
||||
repo_file() { mkdir -p "$(dirname "$REPO/dotfiles/$1")"; printf '%s\n' "$2" > "$REPO/dotfiles/$1"; }
|
||||
# live_file <absolute path under $HOME> <content>
|
||||
live_file() { mkdir -p "$(dirname "$1")"; printf '%s\n' "$2" > "$1"; }
|
||||
|
||||
# systemd_unit <name> <ExecStart> — a unit in the systemd-user package
|
||||
systemd_unit() {
|
||||
mkdir -p "$REPO/dotfiles/systemd-user/.config/systemd/user"
|
||||
printf '[Unit]\nDescription=%s\n[Service]\nExecStart=%s\n[Install]\nWantedBy=default.target\n' "$1" "$2" \
|
||||
> "$REPO/dotfiles/systemd-user/.config/systemd/user/$1"
|
||||
}
|
||||
|
||||
@test "generated theme output is never adopted into a symlink" {
|
||||
repo_file "ghostty/.config/ghostty/themes/noctalia" 'background = "#f43841"'
|
||||
live_file "$HOME/.config/ghostty/themes/noctalia" 'background = "#f43841"'
|
||||
run "$REPO/scripts/deploy.sh"
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" == *"SKIP"*".config/ghostty/themes/noctalia"* ]]
|
||||
[ -f "$HOME/.config/ghostty/themes/noctalia" ]
|
||||
[ ! -L "$HOME/.config/ghostty/themes/noctalia" ]
|
||||
}
|
||||
|
||||
@test "a diverged live palette is never quarantined and reverted to a stale copy" {
|
||||
# The dangerous shape: the tracked file matches today's palette, the theme changes
|
||||
# tomorrow, and sync would quarantine the live file and restore the stale one.
|
||||
repo_file "niri/.config/niri/noctalia.kdl" 'active-color "#e01b24"'
|
||||
live_file "$HOME/.config/niri/noctalia.kdl" 'active-color "#ff8c00"'
|
||||
run "$REPO/scripts/deploy.sh"
|
||||
[ "$status" -eq 0 ]
|
||||
grep -q 'active-color "#ff8c00"' "$HOME/.config/niri/noctalia.kdl"
|
||||
[ ! -L "$HOME/.config/niri/noctalia.kdl" ]
|
||||
[ ! -d "$REPO/.quarantine" ]
|
||||
}
|
||||
|
||||
@test "an ordinary identical config is still adopted" {
|
||||
# Control against an exclusion so broad the tool stops deploying anything.
|
||||
repo_file "ghostty/.config/ghostty/config.ghostty" 'theme = "gruber"'
|
||||
live_file "$HOME/.config/ghostty/config.ghostty" 'theme = "gruber"'
|
||||
run "$REPO/scripts/deploy.sh"
|
||||
[ "$status" -eq 0 ]
|
||||
[ -L "$HOME/.config/ghostty/config.ghostty" ]
|
||||
[ "$(realpath "$HOME/.config/ghostty/config.ghostty")" = "$(realpath "$REPO/dotfiles/ghostty/.config/ghostty/config.ghostty")" ]
|
||||
}
|
||||
|
||||
@test "--check reports and writes nothing" {
|
||||
repo_file "ghostty/.config/ghostty/config.ghostty" 'theme = "gruber"'
|
||||
live_file "$HOME/.config/ghostty/config.ghostty" 'theme = "tokyo-night"'
|
||||
run "$REPO/scripts/deploy.sh" --check
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" == *"DRIFT"* || "$output" == *"QUAR"* ]]
|
||||
[ ! -L "$HOME/.config/ghostty/config.ghostty" ]
|
||||
grep -q 'theme = "tokyo-night"' "$HOME/.config/ghostty/config.ghostty"
|
||||
[ ! -d "$REPO/.quarantine" ]
|
||||
}
|
||||
|
||||
@test "a unit already enabled is enabled but not started" {
|
||||
systemd_unit lock.service /bin/sh
|
||||
printf 'enabled\n' > "$UNIT_STATE"
|
||||
run "$REPO/scripts/deploy.sh"
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" == *"not started"* ]]
|
||||
grep -q 'systemctl --user enable lock.service' "$STUB_LOG"
|
||||
! grep -q -- '--now' "$STUB_LOG"
|
||||
}
|
||||
|
||||
@test "a linked unit is not started either" {
|
||||
# `is-enabled` exits 1 for a linked unit, exactly as it does for a disabled one, so the
|
||||
# printed state is the signal — exit status cannot tell them apart.
|
||||
systemd_unit timer-driven.service /bin/sh
|
||||
printf 'linked\n' > "$UNIT_STATE"
|
||||
run "$REPO/scripts/deploy.sh"
|
||||
[ "$status" -eq 0 ]
|
||||
! grep -q -- '--now' "$STUB_LOG"
|
||||
}
|
||||
|
||||
@test "a disabled unit is enabled and started, so a fresh box still comes up" {
|
||||
systemd_unit fresh.service /bin/sh
|
||||
printf 'disabled\n' > "$UNIT_STATE"
|
||||
run "$REPO/scripts/deploy.sh"
|
||||
[ "$status" -eq 0 ]
|
||||
grep -q 'systemctl --user enable --now fresh.service' "$STUB_LOG"
|
||||
}
|
||||
|
||||
@test "a unit whose ExecStart is absent here stays inert" {
|
||||
systemd_unit otherbox.service /nonexistent/daemon
|
||||
printf 'disabled\n' > "$UNIT_STATE"
|
||||
run "$REPO/scripts/deploy.sh"
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" == *"SKIP"*otherbox.service* ]]
|
||||
! grep -q enable "$STUB_LOG"
|
||||
}
|
||||
|
||||
@test "a unit whose ExecStart uses a systemd specifier still resolves here" {
|
||||
# `%h` is expanded by systemd, not by the shell, so matching the literal string makes a
|
||||
# unit belonging to THIS box look foreign and skip it in silence. The victim is this repo's
|
||||
# own heartbeat: `ExecStart=%h/.omp/scripts/live-sync.sh`, skipped on every box. Refs #44.
|
||||
mkdir -p "$HOME/.local/bin"
|
||||
printf '#!/bin/sh\ntrue\n' > "$HOME/.local/bin/helper"
|
||||
chmod +x "$HOME/.local/bin/helper"
|
||||
systemd_unit heartbeat.service '%h/.local/bin/helper'
|
||||
printf 'linked\n' > "$UNIT_STATE"
|
||||
run "$REPO/scripts/deploy.sh"
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" == *"heartbeat.service (already linked"* ]]
|
||||
grep -q 'systemctl --user enable heartbeat.service' "$STUB_LOG"
|
||||
! grep -q -- '--now' "$STUB_LOG"
|
||||
}
|
||||
Executable
+223
@@ -0,0 +1,223 @@
|
||||
#!/usr/bin/env bats
|
||||
# tests/pkg-inventory.bats — black-box tests for scripts/pkg-inventory.sh (Refs #51)
|
||||
#
|
||||
# Contract: `install.sh` installs desired-minus-installed from packages/*.pkgs. This tool walks
|
||||
# the other direction — installed-minus-declared — because a manifest the machine has quietly
|
||||
# outgrown cannot reproduce the machine on a rebuild. Only stdout, stderr and the exit status are
|
||||
# observed: 0 no drift, 1 drift (hand-installed packages undeclared), 2 usage, 3 sync databases
|
||||
# unavailable so repo/AUR classification is impossible.
|
||||
#
|
||||
# Every pacman/flatpak call hits a stub: nothing here may query the real package database, and a
|
||||
# real pacman on PATH would make the fixture answers depend on the workstation.
|
||||
|
||||
setup() {
|
||||
TEST_TMP="$(mktemp -d)"
|
||||
SCRIPT="$BATS_TEST_DIRNAME/../scripts/pkg-inventory.sh"
|
||||
REPO="$TEST_TMP/repo"
|
||||
mkdir -p "$REPO/packages" "$TEST_TMP/bin"
|
||||
|
||||
# --- manifests: common + host(box) + aur ------------------------------------
|
||||
cat > "$REPO/packages/common.pkgs" <<'EOF'
|
||||
# common desired state
|
||||
ghostty
|
||||
zoxide
|
||||
vlc # declared, deliberately NOT installed below
|
||||
EOF
|
||||
cat > "$REPO/packages/box.pkgs" <<'EOF'
|
||||
neovim
|
||||
EOF
|
||||
cat > "$REPO/packages/aur.pkgs" <<'EOF'
|
||||
typora # AUR-only desired state
|
||||
EOF
|
||||
|
||||
# --- pacman log: install day 2026-01-01, hand installs from 2026-03 ----------
|
||||
cat > "$TEST_TMP/pacman.log" <<'EOF'
|
||||
[2026-01-01T10:00:00-0800] [PACMAN] Running 'pacman --sysroot /tmp/calamares-root-x -S base'
|
||||
[2026-01-01T10:00:01-0800] [ALPM] installed filesystem (2026.01.01-1)
|
||||
[2026-01-01T10:00:02-0800] [ALPM] installed base (3-1)
|
||||
[2026-01-01T10:00:03-0800] [ALPM] installed libfoo (1.0-1)
|
||||
[2026-03-04T09:00:00-0800] [ALPM] installed bun (1.2-1)
|
||||
[2026-03-04T09:30:00-0800] [ALPM] upgraded filesystem (2026.01.01-1 -> 2026.03.01-1)
|
||||
[2026-03-05T09:00:00-0800] [ALPM] installed nirimod-git (r7-1)
|
||||
[2026-03-06T09:00:00-0800] [ALPM] removed base (3-1)
|
||||
EOF
|
||||
|
||||
# --- installed state --------------------------------------------------------
|
||||
# ghostty/zoxide/neovim/typora declared. libfoo: explicit, arrived with the installer.
|
||||
# bun/nirimod-git: installed by hand afterwards, undeclared. python-hatchling: orphan.
|
||||
printf '%s\n' base bun filesystem ghostty libfoo neovim nirimod-git typora zoxide > "$TEST_TMP/local-all"
|
||||
printf '%s\n' bun ghostty libfoo neovim nirimod-git typora zoxide > "$TEST_TMP/local-explicit"
|
||||
printf '%s\n' python-hatchling > "$TEST_TMP/orphans"
|
||||
# nirimod-git is deliberately ABSENT here: no sync db can serve it, which is the fact that
|
||||
# routes it to aur.pkgs in the test below.
|
||||
printf '%s\n' bun ghostty neovim typora zoxide libfoo vlc python-hatchling base filesystem > "$TEST_TMP/sync-all"
|
||||
|
||||
# Four flag combinations are the script's whole interface to the package manager; the stub
|
||||
# answers those and refuses anything else, so an accidental new query fails loudly.
|
||||
cat > "$TEST_TMP/bin/pacman" <<'STUB'
|
||||
#!/usr/bin/env bash
|
||||
case "$1" in
|
||||
-Sl) [ "${STUB_SYNC_EMPTY:-0}" = 1 ] && exit 1
|
||||
sed 's/^/syncdb /' "$SYNC_ALL" ;;
|
||||
-Qqe) cat "$LOCAL_EXPLICIT" ;;
|
||||
-Qtdq) cat "$ORPHANS"; [ -s "$ORPHANS" ] ;;
|
||||
-Qq) cat "$LOCAL_ALL" ;;
|
||||
*) echo "stub pacman: unhandled args: $*" >&2; exit 64 ;;
|
||||
esac
|
||||
STUB
|
||||
cat > "$TEST_TMP/bin/flatpak" <<'STUB'
|
||||
#!/usr/bin/env bash
|
||||
[ "${STUB_NO_FLATPAK:-0}" = 1 ] && exit 127
|
||||
printf '%s\n' com.discordapp.Discord
|
||||
STUB
|
||||
chmod +x "$TEST_TMP/bin/pacman" "$TEST_TMP/bin/flatpak"
|
||||
|
||||
export PATH="$TEST_TMP/bin:$PATH"
|
||||
export PKGINV_REPO="$REPO" PKGINV_HOST=box PKGINV_LOG="$TEST_TMP/pacman.log"
|
||||
export LOCAL_ALL="$TEST_TMP/local-all" LOCAL_EXPLICIT="$TEST_TMP/local-explicit"
|
||||
export ORPHANS="$TEST_TMP/orphans" SYNC_ALL="$TEST_TMP/sync-all"
|
||||
}
|
||||
|
||||
teardown() { rm -rf "$TEST_TMP"; }
|
||||
|
||||
# section RE_START RE_END — the report from RE_START's line up to (not including) RE_END, so an
|
||||
# assertion proves a name landed in a specific section instead of merely appearing somewhere in the
|
||||
# report. Start inclusive (the count and the names sit on the label line), terminator exclusive (a
|
||||
# plain sed range would leak the next section's first line). Anchoring matters: an unanchored start
|
||||
# runs the range to end-of-output, silently turning every absence assertion into a vacuous pass —
|
||||
# exactly how four of these tests were passing before this helper was fixed.
|
||||
section() { printf '%s\n' "$output" | awk -v s="$1" -v e="$2" '$0 ~ e {on=0} $0 ~ s {on=1} on'; }
|
||||
ADDITIONS() { section "^undeclared additions" "^installer-provided"; }
|
||||
|
||||
@test "header names the host and takes the baseline from the oldest install line" {
|
||||
run "$SCRIPT"
|
||||
[ "$status" -eq 1 ] # the fixture has drift by design
|
||||
[[ "$output" == *"pkg-inventory host=box"* ]]
|
||||
[[ "$output" == *"baseline=2026-01-01"* ]]
|
||||
}
|
||||
|
||||
@test "hand-installed packages are reported as additions" {
|
||||
run "$SCRIPT"
|
||||
[[ "$output" == *"undeclared additions (declare these): 2"* ]]
|
||||
s="$(ADDITIONS)"
|
||||
[[ "$s" == *bun* ]]
|
||||
[[ "$s" == *nirimod-git* ]]
|
||||
}
|
||||
|
||||
@test "a package the installer provided is not reported as an addition" {
|
||||
run "$SCRIPT"
|
||||
additions="$(ADDITIONS)"
|
||||
[[ "$additions" != *libfoo* ]]
|
||||
[[ "$(section "^installer-provided" "^declared,")" == *libfoo* ]]
|
||||
# The folded block must end in a newline. Without one, the following label is glued onto the
|
||||
# last folded line and every section after it vanishes from a sliced report.
|
||||
[[ "$(section "^installer-provided" "^declared,")" != *declared,* ]]
|
||||
}
|
||||
|
||||
@test "AUR-only packages are separated from sync-repo packages" {
|
||||
run "$SCRIPT"
|
||||
# nirimod-git is missing from the sync-DB fixture, so only a helper can install it: it must be
|
||||
# routed to aur.pkgs, not to a pacman line that would fail on a fresh box. Bash `*` crosses
|
||||
# newlines, so the absence check runs on one line rather than on the whole section.
|
||||
repo_line="$(section '^ repo ' '^ aur ')"
|
||||
[[ "$repo_line" == *"repo (sync dbs): bun"* ]]
|
||||
[[ "$repo_line" != *nirimod-git* ]]
|
||||
[[ "$(section '^ aur ' '^installer-provided')" == *"aur (needs a helper): nirimod-git"* ]]
|
||||
}
|
||||
|
||||
@test "declared-but-missing packages are listed for install.sh" {
|
||||
run "$SCRIPT"
|
||||
[[ "$output" == *"declared, not installed"* ]]
|
||||
[[ "$(section "^declared," "^orphans")" == *vlc* ]]
|
||||
}
|
||||
|
||||
@test "orphans are reported as ignored and never emitted" {
|
||||
run "$SCRIPT"
|
||||
[[ "$output" == *orphans*python-hatchling* ]]
|
||||
run "$SCRIPT" --emit
|
||||
[[ "$output" != *python-hatchling* ]]
|
||||
}
|
||||
|
||||
@test "--baseline moves packages installed on that date into the installer set" {
|
||||
# Inclusive date semantics: pushing the baseline to bun's install date makes bun installer
|
||||
# furniture, while nirimod-git (the next day) is still a hand install.
|
||||
run env PKGINV_BASELINE=2026-03-04 "$SCRIPT"
|
||||
[[ "$output" == *"baseline=2026-03-04"* ]]
|
||||
s="$(ADDITIONS)"
|
||||
[[ "$s" != *bun* ]]
|
||||
[[ "$s" == *nirimod-git* ]]
|
||||
}
|
||||
|
||||
@test "--emit prints lines that survive the manifest parser" {
|
||||
run "$SCRIPT" --emit
|
||||
[ "$status" -eq 0 ]
|
||||
# install.sh reads manifests as `sed 's/#.*//'` then the first field, so an emitted name must
|
||||
# be a bare token: a stray path or trailing note would be handed to pacman as a package name.
|
||||
bad="$(printf '%s\n' "$output" | grep -v '^#' | grep -vE '^[A-Za-z0-9@._+-]+$' || true)"
|
||||
[ -z "$bad" ]
|
||||
printf '%s\n' "$output" > "$REPO/packages/emitted.pkgs"
|
||||
names="$(sed 's/#.*//' "$REPO/packages/emitted.pkgs" | awk '{if ($1) print $1}' | sort | tr '\n' ' ')"
|
||||
[[ "$names" == *bun* ]]
|
||||
[[ "$names" == *nirimod-git* ]]
|
||||
[[ "$names" != *ghostty* ]]
|
||||
[[ "$names" != *libfoo* ]]
|
||||
[[ "$names" != *vlc* ]]
|
||||
}
|
||||
|
||||
@test "an unknown host gets the common manifest only, so host packages look undeclared" {
|
||||
# Mirrors install.sh: wrong-host runs are a no-op, not a hazard. Here that means neovim,
|
||||
# declared only in box.pkgs, counts as an addition when the host is not box.
|
||||
run env PKGINV_HOST=otherbox "$SCRIPT"
|
||||
[[ "$(ADDITIONS)" == *neovim* ]]
|
||||
}
|
||||
|
||||
@test "no drift exits 0" {
|
||||
printf '%s\n' ghostty libfoo zoxide > "$TEST_TMP/local-explicit"
|
||||
run "$SCRIPT"
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" == *"undeclared additions (declare these): 0"* ]]
|
||||
}
|
||||
|
||||
@test "missing sync databases fail loudly rather than misclassifying everything as AUR" {
|
||||
run env STUB_SYNC_EMPTY=1 "$SCRIPT"
|
||||
[ "$status" -eq 3 ]
|
||||
[[ "$output" == *"sync"* ]]
|
||||
}
|
||||
|
||||
@test "flatpak apps are reported separately from pacman packages" {
|
||||
run "$SCRIPT"
|
||||
[[ "$output" == *"flatpak"*com.discordapp.Discord* ]]
|
||||
}
|
||||
|
||||
@test "a box without flatpak still reports the pacman inventory" {
|
||||
run env STUB_NO_FLATPAK=1 "$SCRIPT"
|
||||
[ "$status" -eq 1 ]
|
||||
[[ "$output" == *"flatpak"* ]]
|
||||
[[ "$(ADDITIONS)" == *bun* ]]
|
||||
}
|
||||
|
||||
@test "the baseline is found in a rotated log when the install day has aged out of the live one" {
|
||||
# pacman rotates its log; without reading the rotated file the whole base system would be
|
||||
# reported as hand-installed additions on any machine older than the rotation window.
|
||||
mv "$TEST_TMP/pacman.log" "$TEST_TMP/pacman.log.1"
|
||||
printf '[2026-10-01T09:00:00-0700] [ALPM] upgraded zoxide (0.9-1 -> 0.10-1)\n' > "$TEST_TMP/pacman.log"
|
||||
run env PKGINV_LOG="$TEST_TMP/pacman.log $TEST_TMP/pacman.log.1" "$SCRIPT"
|
||||
[[ "$output" == *"baseline=2026-01-01"* ]]
|
||||
[[ "$(ADDITIONS)" != *libfoo* ]]
|
||||
}
|
||||
|
||||
@test "a log larger than the pipe buffer still yields the baseline" {
|
||||
# A real install day writes thousands of install lines. `sort | head -1` under pipefail dies of
|
||||
# SIGPIPE once that output exceeds the pipe buffer, and no small fixture can show it — the first
|
||||
# run against a real log is where it surfaced. seq, not yes: yes would SIGPIPE in the fixture.
|
||||
seq 1 20000 | awk '{print "[2025-05-05T10:00:00-0700] [ALPM] installed pkgfiller (1-1)"}' > "$TEST_TMP/big.log"
|
||||
cat "$TEST_TMP/big.log" "$TEST_TMP/pacman.log" > "$TEST_TMP/combined.log"
|
||||
run env PKGINV_LOG="$TEST_TMP/combined.log" "$SCRIPT"
|
||||
[ "$status" -eq 1 ]
|
||||
[[ "$output" == *"baseline=2025-05-05"* ]]
|
||||
}
|
||||
|
||||
@test "usage is a distinct exit status from drift" {
|
||||
run "$SCRIPT" --nope
|
||||
[ "$status" -eq 2 ]
|
||||
}
|
||||
Reference in New Issue
Block a user