From 58f2d61be4c55c7cf7bdbb12f3fed6794e7481b5 Mon Sep 17 00:00:00 2001 From: sommerfeld Date: Wed, 20 May 2026 13:56:10 +0100 Subject: 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). --- nix/host.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'nix/host.nix') 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 -- cgit v1.3.1