Bernardo Magri
ac24ac7c34
Since d8e1a13 removed theme-state.json, auto_commit's fixed pathspec
(state.json + both legacy names) made `git commit` abort — unlike
`git diff`, commit errors on a pathspec that matches nothing — so every
per-mutation settings commit was silently "skipped" and state.json
stayed dirty until a lifecycle sweep caught it. Filter the legacy names
down to those git still knows (index or HEAD — a migration's staged
`git rm` still rides along). checks.auto-theme now runs its state dir
as a git repo with autoCommit on and asserts each set/apply lands as
its own commit leaving nothing dirty — the exact post-#107 repo shape
that used to abort. state-sync 0.5.0 → 0.5.1.
V2: nix build .#checks.x86_64-linux.auto-theme (KVM VM run, passed,
including the new git assertions); the built tool was also exercised
against a clone of a real post-#107 machine flake — the set
auto-committed and the tree stayed clean.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
54 lines
1.6 KiB
Nix
54 lines
1.6 KiB
Nix
{ lib
|
|
, stdenvNoCC
|
|
, python3
|
|
, makeWrapper
|
|
, awww
|
|
, libnotify
|
|
, git
|
|
# Shipped theme presets, baked into the package as a fallback so
|
|
# `list`/`apply` work even when $NOMARCHY_PATH has no themes/ dir.
|
|
# Already a store artifact (nomarchy-default-themes merges the repo's
|
|
# ./themes with backgrounds/ symlinked from nomarchy-wallpapers) — the
|
|
# wrapper points straight at it, no copy, so it stays in the closure
|
|
# without duplicating it into $out.
|
|
, themesDir ? null
|
|
}:
|
|
|
|
stdenvNoCC.mkDerivation {
|
|
pname = "nomarchy-state-sync";
|
|
version = "0.5.1";
|
|
|
|
src = ./.;
|
|
|
|
nativeBuildInputs = [ makeWrapper ];
|
|
buildInputs = [ python3 ];
|
|
|
|
installPhase = ''
|
|
runHook preInstall
|
|
|
|
install -Dm755 nomarchy-state-sync.py $out/bin/nomarchy-state-sync
|
|
patchShebangs $out/bin/nomarchy-state-sync
|
|
|
|
# Stdlib-only Python. home-manager is deliberately NOT wrapped in —
|
|
# the rebuild must use the user's own home-manager from their PATH.
|
|
wrapProgram $out/bin/nomarchy-state-sync \
|
|
--prefix PATH : ${lib.makeBinPath [ awww libnotify git ]} \
|
|
${lib.optionalString (themesDir != null)
|
|
"--set NOMARCHY_DEFAULT_THEMES ${themesDir}"}
|
|
|
|
# #107: old CLI name kept as a symlink so muscle memory and scripts
|
|
# survive a pull (drop after the next stable release notes say so).
|
|
# After wrapProgram so it points at the wrapper, not the raw script.
|
|
ln -s nomarchy-state-sync $out/bin/nomarchy-theme-sync
|
|
|
|
runHook postInstall
|
|
'';
|
|
|
|
meta = {
|
|
description = "Nomarchy state writer + Home Manager rebuild dispatcher";
|
|
license = lib.licenses.mit;
|
|
mainProgram = "nomarchy-state-sync";
|
|
platforms = lib.platforms.linux;
|
|
};
|
|
}
|