From 869ca6b16c81da5b5b70dda6d350f30202717c4a Mon Sep 17 00:00:00 2001 From: Bernardo Magri Date: Fri, 10 Jul 2026 13:41:34 +0100 Subject: [PATCH] fix(cli): nomarchy-pull skips git when no upstream 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. --- README.md | 8 +++++++- modules/nixos/default.nix | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1a30585..d726ee3 100644 --- a/README.md +++ b/README.md @@ -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` | diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 2f90900..160463a 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -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 switch the whole palette