diff options
| author |  sommerfeld <sommerfeld@sommerfeld.dev> | 2026-06-19 17:57:23 +0100 |
|---|---|---|
| committer | sommerfeld <sommerfeld@sommerfeld.dev> | 2026-06-19 17:57:23 +0100 |
| commit | cf5a2f46f0167c8495d28de5b1364c8bc460b6d0 (patch) | |
| tree | 9c46279f71aab9757abef8af927a75b198690bf3 /dot_config | |
| parent | 259a3b989513f47f6cc5d36eaaf9e5fbef9b4d9a (diff) | |
| download | dotfiles-cf5a2f46f0167c8495d28de5b1364c8bc460b6d0.tar.gz dotfiles-cf5a2f46f0167c8495d28de5b1364c8bc460b6d0.tar.bz2 dotfiles-cf5a2f46f0167c8495d28de5b1364c8bc460b6d0.zip | |
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.
Diffstat (limited to 'dot_config')
| -rw-r--r-- | dot_config/containers/storage.conf.tmpl (renamed from dot_config/containers/storage.conf) | 15 | ||||
| -rw-r--r-- | dot_config/nvim/lua/plugins/ai.lua | 6 |
2 files changed, 18 insertions, 3 deletions
diff --git a/dot_config/containers/storage.conf b/dot_config/containers/storage.conf.tmpl index 3ba957e..62dd35c 100644 --- a/dot_config/containers/storage.conf +++ b/dot_config/containers/storage.conf.tmpl @@ -1,3 +1,17 @@ +{{- $machineRole := default "host" (index . "machineRole") -}} +{{- if eq $machineRole "vm" -}} +# Rootless podman storage configuration. +# +# The VM uses ext4, so use the kernel overlay driver. runroot/graphroot default +# to $XDG_RUNTIME_DIR/containers and $XDG_DATA_HOME/containers/storage. + +[storage] +driver = "overlay" + +[storage.options.overlay] +# Kernel >=5.13 supports rootless overlay natively on the VM, so leave +# mount_program unset and avoid fuse-overlayfs. +{{- else -}} # Rootless podman storage configuration. # # Uses the native kernel btrfs graph driver — much faster than fuse-overlayfs @@ -15,3 +29,4 @@ [storage] driver = "btrfs" +{{- end }} diff --git a/dot_config/nvim/lua/plugins/ai.lua b/dot_config/nvim/lua/plugins/ai.lua index 6ebc6f5..81a8307 100644 --- a/dot_config/nvim/lua/plugins/ai.lua +++ b/dot_config/nvim/lua/plugins/ai.lua @@ -1,8 +1,8 @@ -- Prefer the chezmoi-pinned Node 24 (host has Arch's system node 26, which -- breaks copilot-language-server — see --- ~/.local/share/chezmoi/run_onchange_after_install-copilot-node.sh). Fall --- back to `node` on PATH for hosts that don't run chezmoi (remote-dev VM --- via Nix Home-Manager, where home.nix pins nodejs_24 in the profile). +-- ~/.local/share/chezmoi/run_onchange_after_install-copilot-node.sh.tmpl). +-- Fall back to `node` on PATH on the VM, where Nix pins nodejs_24 in the +-- profile. local pinned_node = vim.fs.joinpath( vim.env.XDG_DATA_HOME or (vim.env.HOME .. "/.local/share"), "copilot-node/bin/node" |