From cf5a2f46f0167c8495d28de5b1364c8bc460b6d0 Mon Sep 17 00:00:00 2001 From: sommerfeld Date: Fri, 19 Jun 2026 17:57:23 +0100 Subject: Migrate VM dotfiles to chezmoi Move VM dotfile deployment out of Home Manager and into chezmoi with a machineRole guard. Add VM recipes for applying chezmoi state and restarting the Nix GnuPG agent. Make host-only hooks no-op on the VM and render container storage per role. --- nix/common.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'nix/common.nix') diff --git a/nix/common.nix b/nix/common.nix index f9a7042..7290395 100644 --- a/nix/common.nix +++ b/nix/common.nix @@ -1,12 +1,10 @@ { config, pkgs, lib, dotfilesRoot, ... }: -# Shared Home-Manager module: ONLY package installation. Config-file -# deployment is *not* handled here — on the Arch host, chezmoi owns -# every dotfile under $HOME; on the remote-dev VM, `vm.nix` carries -# its own `xdg.configFile`/`home.activation` block since chezmoi isn't -# installed there. Keeping this module deployment-agnostic prevents -# home-manager from conflicting with chezmoi on the host (which would -# otherwise materialize as `.backup` files on every `nix-switch`). +# Shared Home-Manager module: ONLY package installation. Dotfile deployment is +# owned by chezmoi on both the Arch host and the remote-dev VM. Keeping this +# module deployment-agnostic prevents home-manager from conflicting with +# chezmoi-owned files (which would otherwise materialize as `.backup` files on +# every `nix-switch`). # # Policy: this profile carries leaf CLI tools, editor/AI-agent runtimes # (node, uv), and build *orchestrators* (cmake, ninja, ccache, sccache). @@ -47,6 +45,7 @@ choose zoxide just + chezmoi # Viewers bat @@ -160,8 +159,7 @@ # The nix `podman` is wrapped to find these helpers via /nix/store # paths, so we don't need a containers.conf for `helper_binaries_dir`. # Per-user containers config (registries/storage/policy) lives under - # chezmoi at `private_dot_config/containers/` and is symlinked on the - # VM by `vm.nix`'s xdg.configFile block. + # chezmoi at `dot_config/containers/`. podman crun # OCI runtime (lighter than runc; default for rootless) conmon # container monitor process -- cgit v1.3.1