fix(cli): nomarchy-pull skips git when no upstream
All checks were successful
Check / eval (push) Successful in 2m54s

Machine flakes often have no remote (local auto-commits only). Distro
updates come from nix flake update of the nomarchy input. Only git pull
--ff-only when @{u} is set; always update the lock; print nomarchy rev.
This commit is contained in:
2026-07-10 13:41:34 +01:00
parent 1e1d568947
commit 869ca6b16c
2 changed files with 8 additions and 2 deletions

View File

@@ -182,12 +182,18 @@ home-manager switch --flake .#me # desktop: every theme change, no
Day-to-day you'll use the shipped shortcuts instead:
```sh
nomarchy-pull # git pull (if checkout) + nix flake update — no rebuild
nomarchy-pull # nix flake update — refresh inputs (nomarchy, nixpkgs, …);
# optional git pull only if ~/.nomarchy tracks a remote
nomarchy-rebuild # system rebuild against the CURRENT lock (sudo inside;
# BTRFS snapshot first when snapper is on; nvd diff after)
nomarchy-home # home-manager switch — desktop only, no sudo, no lock bump
```
`~/.nomarchy` is **your machine flake** (`system.nix` / `home.nix`). Newer
Nomarchy code arrives when `flake.lock` updates the `nomarchy` input
(`nomarchy-pull`), not by `git pull` of that directory (many installs have
no remote there — only local commits from auto-commit).
| When | Run |
|---|---|
| Pull newer Nomarchy / nixpkgs / inputs | `nomarchy-pull` |

View File

@@ -54,7 +54,7 @@ in
${distroName} a NixOS desktop, themed from one JSON.
nomarchy-pull git pull + flake input update (no rebuild)
nomarchy-pull update flake inputs (nomarchy, nixpkgs, )
nomarchy-rebuild rebuild the system (current lock)
nomarchy-home rebuild the desktop / Home Manager
nomarchy-theme-sync apply <theme> switch the whole palette