diff options
| author |  sommerfeld <sommerfeld@sommerfeld.dev> | 2026-05-20 13:56:10 +0100 |
|---|---|---|
| committer | sommerfeld <sommerfeld@sommerfeld.dev> | 2026-05-20 13:56:10 +0100 |
| commit | 58f2d61be4c55c7cf7bdbb12f3fed6794e7481b5 (patch) | |
| tree | e5fffde7bcb1bc6778e0e7b489b5666dbe755746 /nix/host.nix | |
| parent | 3bc07df183cba19a9824ccf074041347a8bd1490 (diff) | |
| download | dotfiles-58f2d61be4c55c7cf7bdbb12f3fed6794e7481b5.tar.gz dotfiles-58f2d61be4c55c7cf7bdbb12f3fed6794e7481b5.tar.bz2 dotfiles-58f2d61be4c55c7cf7bdbb12f3fed6794e7481b5.zip | |
fix(nix): parameterize dotfiles path per profile; rename dockerfile LSP
- common.nix hardcoded the runtime dotfiles checkout to
~/.local/share/dotfiles, which is correct for the remote-dev VM but
not the Arch host (where the canonical clone lives at ~/dotfiles).
ssh activation was failing with 'cannot stat
/home/sommerfeld/.local/share/dotfiles/private_dot_ssh/config' on
every host nix-switch.
Promote the path to a typed option (config.my.dotfilesPath) and set
it from each profile:
nix/host.nix -> $HOME/dotfiles
nix/vm.nix -> $HOME/.local/share/dotfiles
common.nix now wraps its config in 'config = { ... }' so the
options can sit alongside.
- dockerfile-language-server-nodejs was renamed in nixpkgs to
dockerfile-language-server; pick up the new name to silence the
evaluation warning (the rename will eventually become a hard error).
Diffstat (limited to 'nix/host.nix')
| -rw-r--r-- | nix/host.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nix/host.nix b/nix/host.nix index 7d81ffe..d589002 100644 --- a/nix/host.nix +++ b/nix/host.nix @@ -9,6 +9,11 @@ home.username = builtins.getEnv "USER"; home.homeDirectory = builtins.getEnv "HOME"; + # The Arch host keeps its chezmoi source state at ~/dotfiles (the + # canonical clone location for the dotfiles repo). The VM convention + # of ~/.local/share/dotfiles doesn't apply here. + my.dotfilesPath = "${builtins.getEnv "HOME"}/dotfiles"; + # ── Smartcard (Yubikey) ──────────────────────────────────────────────────── # Nix's gnupg ships its own scdaemon. Delegate to the system pcscd # service instead of letting nix's scdaemon open the USB device |