fix(cli): lifecycle tools in HM so stale pull can self-heal

Extract nomarchy-pull/rebuild/home to pkgs/nomarchy-lifecycle; install
via system + home. Home profile wins on PATH so home-manager switch
installs the fixed pull (skip git when no upstream) without waiting
for a system rebuild that needed a working pull first.

V0: flake check --no-build green.

modules/home/default.nix

@@ -61,6 +61,10 @@
     awww       # wallpaper daemon with animated transitions (the swww fork)
     libnotify
     hyprpicker
+    # Lifecycle CLIs (pull/rebuild/home). HM profile usually precedes
+    # /run/current-system on PATH, so nomarchy-home can replace a broken
+    # system-generation nomarchy-pull without a full sys rebuild.
+    nomarchy-lifecycle
   ];
 
   home.sessionVariables = {

modules/nixos/default.nix

@@ -333,124 +333,11 @@ in
       nomarchy-control-center # TUI control center
       nomarchy-detect-hw  # post-install hardware re-probe (HARDWARE.md §8)
 
-      # Day-to-day lifecycle (README §3). Always run as your user —
-      # `nix flake update` / git must not run as root (libgit2 refuses a
-      # user-owned flake); sudo is only for the system switch.
-      #
-      #   nomarchy-pull     git pull (if checkout) + flake.lock update
-      #   nomarchy-rebuild  system switch against the *current* lock
-      #   nomarchy-home     Home Manager switch (desktop layer)
-      #
-      # Full distro upgrade:  nomarchy-pull && nomarchy-rebuild && nomarchy-home
-      # Config-only system:   nomarchy-rebuild
-      # Theme/desktop only:   nomarchy-home
-      #
-      # Legacy names (sys-update / sys-rebuild / home-update) stay as
-      # thin wrappers so old docs and muscle memory keep working.
-      (pkgs.writeShellScriptBin "nomarchy-pull" ''
-        set -euo pipefail
-        if [ "$(id -u)" -eq 0 ]; then
-          echo "nomarchy-pull: run as your normal user" >&2
-          exit 1
-        fi
-        flake="''${NOMARCHY_PATH:-$HOME/.nomarchy}"
-        if [ ! -d "$flake" ]; then
-          echo "nomarchy-pull: flake path not found: $flake" >&2
-          echo "  Set NOMARCHY_PATH or clone/symlink your flake to ~/.nomarchy." >&2
-          exit 1
-        fi
-        # 1) Your checkout (system.nix / home.nix / local edits).
-        if [ -d "$flake/.git" ]; then
-          echo "nomarchy-pull: git pull --ff-only in $flake"
-          git -C "$flake" pull --ff-only
-        else
-          echo "nomarchy-pull: $flake is not a git checkout — skipping git pull"
-        fi
-        # 2) Flake inputs (nixpkgs, nomarchy, home-manager, …).
-        echo "nomarchy-pull: nix flake update in $flake"
-        nix flake update --flake "$flake"
-        echo "nomarchy-pull: done — next: nomarchy-rebuild  then  nomarchy-home"
-      '')
-      (pkgs.writeShellScriptBin "nomarchy-rebuild" ''
-        set -euo pipefail
-        if [ "$(id -u)" -eq 0 ]; then
-          echo "nomarchy-rebuild: run as your normal user (it sudos the rebuild itself)" >&2
-          exit 1
-        fi
-        flake="''${NOMARCHY_PATH:-$HOME/.nomarchy}"
-        if [ ! -d "$flake" ]; then
-          echo "nomarchy-rebuild: flake path not found: $flake" >&2
-          exit 1
-        fi
-        before=$(readlink -f /run/current-system)
-        log=$(mktemp)
-        trap 'rm -f "$log"' EXIT
-        set +e
-        # Snapshot-first when snapper is on; pass flake path through sudo
-        # (nixos-rebuild-snap used to hardcode /etc/nixos).
-        if command -v nixos-rebuild-snap >/dev/null 2>&1; then
-          sudo env NOMARCHY_PATH="$flake" nixos-rebuild-snap "$@" 2>&1 | tee "$log"
-        else
-          sudo nixos-rebuild switch --flake "$flake#default" "$@" 2>&1 | tee "$log"
-        fi
-        rc=''${PIPESTATUS[0]}
-        set -e
-        if [ "$rc" -ne 0 ]; then
-          echo
-          echo "nomarchy-rebuild: FAILED (exit $rc). Last lines:"
-          tail -n 40 "$log" || true
-          echo
-          echo "Diagnose:  nomarchy-doctor"
-          echo "Recovery:  docs/RECOVERY.md  (boot menu generations / snapper)"
-          exit "$rc"
-        fi
-        after=$(readlink -f /run/current-system)
-        if [ "$before" = "$after" ]; then
-          echo "nomarchy-rebuild: no changes — the system is identical."
-        else
-          echo "nomarchy-rebuild: what changed:"
-          ${pkgs.nvd}/bin/nvd diff "$before" "$after" || true
-        fi
-      '')
-      (pkgs.writeShellScriptBin "nomarchy-home" ''
-        set -euo pipefail
-        if [ "$(id -u)" -eq 0 ]; then
-          echo "nomarchy-home: run as your normal user" >&2
-          exit 1
-        fi
-        flake="''${NOMARCHY_PATH:-$HOME/.nomarchy}"
-        if [ ! -d "$flake" ]; then
-          echo "nomarchy-home: flake path not found: $flake" >&2
-          exit 1
-        fi
-        log=$(mktemp)
-        trap 'rm -f "$log"' EXIT
-        set +e
-        home-manager switch --flake "$flake" "$@" 2>&1 | tee "$log"
-        rc=''${PIPESTATUS[0]}
-        set -e
-        if [ "$rc" -ne 0 ]; then
-          echo
-          echo "nomarchy-home: FAILED (exit $rc). Last lines:"
-          tail -n 40 "$log" || true
-          echo
-          echo "Diagnose:  nomarchy-doctor"
-          echo "Recovery:  home-manager generations  (or docs/RECOVERY.md)"
-          exit "$rc"
-        fi
-        echo "nomarchy-home: desktop applied."
-      '')
-      # Legacy aliases — same behaviour, old names.
-      (pkgs.writeShellScriptBin "sys-update" ''
-        # Was: flake update + system rebuild. Now the two explicit steps.
-        nomarchy-pull && nomarchy-rebuild "$@"
-      '')
-      (pkgs.writeShellScriptBin "sys-rebuild" ''
-        exec nomarchy-rebuild "$@"
-      '')
-      (pkgs.writeShellScriptBin "home-update" ''
-        exec nomarchy-home "$@"
-      '')
+      # Day-to-day lifecycle (README §3): nomarchy-pull / -rebuild / -home
+      # (+ legacy sys-update / sys-rebuild / home-update). Defined once in
+      # pkgs/nomarchy-lifecycle; also installed via HM so a home switch can
+      # refresh a stale system-package pull script.
+      pkgs.nomarchy-lifecycle
 
       git
       vim