Simplify the multi-arch home setup

Author: Marc Henry de Frahan

.chezmoi.toml.tmpl

@@ -17,35 +17,18 @@
 {{ $ornl_hpc = true -}}
 {{- end -}}
 
-{{/* Set scratch_root automatically based on system type */}}
-{{ $scratch_root := "${HOME}" -}}
+{{/* Scratch root for HPC systems */}}
+{{- $scratch_root := "${HOME}" -}}
 {{- if $nrel_hpc -}}
-{{ $scratch_root = "/scratch/${USER}" -}}
+{{- $scratch_root = "/scratch/${USER}" -}}
 {{- else if $ornl_hpc -}}
-{{ $scratch_root = "/lustre/orion/${USER}" -}}
+{{- $scratch_root = "/lustre/orion/${USER}" -}}
 {{- end -}}
 
-{{/* Prompt for large install directory (pyenv, virtualenvs) */}}
-{{- $use_large_install_dir := false -}}
+{{/* Large install dir for systems with small home directories */}}
 {{- $large_install_dir := "${HOME}" -}}
-{{- if stdinIsATTY -}}
-{{- $use_large_install_dir = promptBoolOnce . "use_large_install_dir" "Install large executables in non-default location" -}}
-{{- else if hasKey . "use_large_install_dir" -}}
-{{- $use_large_install_dir = .use_large_install_dir -}}
-{{- end -}}
-{{- if $use_large_install_dir -}}
-{{- $default_install_dir := printf "%s/install" $scratch_root -}}
-{{- if stdinIsATTY -}}
-{{- $large_install_dir = promptStringOnce . "large_install_dir" (printf "Large install directory [%s]" $default_install_dir) -}}
-{{- if not $large_install_dir -}}
-{{- $large_install_dir = $default_install_dir -}}
-{{- end -}}
-{{- else if and (hasKey . "large_install_dir") .large_install_dir -}}
-{{- $large_install_dir = .large_install_dir -}}
-{{- else -}}
-{{- $large_install_dir = $default_install_dir -}}
-{{- end -}}
-{{- end -}}
+{{/* Multi-arch home: use ~/.local symlink to ~/.local-${ARCH} for shared NFS homes */}}
+{{- $is_multiarch_home := false -}}
 
 [data]
     use_zsh_root_dir = {{ $use_zsh_root_dir }}
@@ -56,5 +39,5 @@
     nrel_cluster = {{ $nrel_cluster }}
     ornl_hpc = {{ $ornl_hpc }}
     scratch_root = {{ $scratch_root | quote }}
-    use_large_install_dir = {{ $use_large_install_dir }}
-    large_install_dir = {{ $large_install_dir | quote }}
+    large_install_dir = {{ $large_install_dir | quote }}
+    is_multiarch_home = {{ $is_multiarch_home }}

.chezmoiignore

@@ -6,6 +6,7 @@ requirements.txt
 .shell-secrets
 docker
 .dockerignore
+.chezmoi-source
 
 {{- if ne .chezmoi.os "darwin" }}
 .config/karabiner

.github/workflows/ci.yml

@@ -26,18 +26,17 @@ jobs:
       - name: Dependencies
         run: |
           bash ./dotfiles/bin/executable_install_bootstrap_dependencies.sh
-      - name: Add arch-specific bin to PATH
+      - name: Add local bin to PATH
         run: |
-          ARCH=$(uname -m)
-          echo "$HOME/.local/${ARCH}/bin" >> $GITHUB_PATH
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
       - name: Clone dotfiles
         run: |
           mkdir -p "$HOME/.local/share/chezmoi"
           git config --global --add safe.directory "$HOME/.local/share/chezmoi"
           git clone --depth 1 --branch "${{ github.head_ref || github.ref_name }}" https://github.com/marchdf/dotfiles.git "$HOME/.local/share/chezmoi"
       - name: Install
         run: |
-          chezmoi init --source="$HOME/.local/share/chezmoi" --promptBool test_machine=t,"Use ZSH_ROOT_DIR for tmux shell"=f,use_large_install_dir=f --promptString email=""
+          chezmoi init --source="$HOME/.local/share/chezmoi" --promptBool test_machine=t,"Use ZSH_ROOT_DIR for tmux shell"=f --promptString email=""
           chezmoi data
           chezmoi apply
       - name: Cold start zsh

README.md

@@ -35,28 +35,26 @@ chezmoi apply -v
 
 ### Linux
 
-Install chezmoi to arch-specific bin:
+For a full environment with all dependencies (recommended), run the bootstrap script:
 
 ```bash
-ARCH=$(uname -m)
-mkdir -p ~/.local/${ARCH}/bin
-sh -c "$(curl -fsLS get.chezmoi.io)" -- -b ~/.local/${ARCH}/bin
-export PATH="$HOME/.local/${ARCH}/bin:$PATH"
+curl -fsSL https://raw.githubusercontent.com/marchdf/dotfiles/main/bin/executable_install_bootstrap_dependencies.sh | bash
+chezmoi init git@github.com:marchdf/dotfiles.git
+chezmoi apply -v
 ```
 
-Then apply dotfiles:
+Or install manually:
 
 ```bash
+sh -c "$(curl -fsLS get.chezmoi.io)" -- -b ~/.local/bin
+export PATH="$HOME/.local/bin:$PATH"
 chezmoi init git@github.com:marchdf/dotfiles.git
-chezmoi diff
 chezmoi apply -v
 ```
 
-For a full environment with all dependencies, run the bootstrap script first:
-
-```bash
-curl -fsSL https://raw.githubusercontent.com/marchdf/dotfiles/main/bin/executable_install_bootstrap_dependencies.sh | bash
-```
+**Note:** Multi-architecture support (for shared NFS homes) can be enabled.
+`chezmoi apply` creates `~/.local-${ARCH}` directories and symlinks `~/.local` to the
+current architecture's directory.
 
 Improved experience
 -------------------

bin/executable_cleanup_installs.sh

@@ -64,11 +64,11 @@ elif [[ "$OS" == "Linux" ]]; then
     else
         echo "Linux (Unknown distro)"
     fi
-    ARCH=$(uname -m)
-    ARCH_BIN="${HOME}/.local/${ARCH}/bin"
-    mkdir -p "${ARCH_BIN}"
-    sh -c "$(curl -fsLS get.chezmoi.io)" -- -b "${ARCH_BIN}"
-    export PATH="${ARCH_BIN}:${HOME}/.local/bin:$PATH"
+
+    # Install chezmoi
+    mkdir -p "${HOME}/.local/bin"
+    sh -c "$(curl -fsLS get.chezmoi.io)" -- -b "${HOME}/.local/bin"
+    export PATH="${HOME}/.local/bin:$PATH"
 else
     echo "Unknown OS: $OS"
 fi

bin/executable_install_bootstrap_dependencies.sh

@@ -1,11 +1,10 @@
 #!/usr/bin/env bash
 
-ARCH=$(uname -m)
-ARCH_BIN="${HOME}/.local/${ARCH}/bin"
-mkdir -p "${ARCH_BIN}"
+LOCAL_BIN="${HOME}/.local/bin"
+mkdir -p "${LOCAL_BIN}"
 
 EMMS_DIR="${HOME}/.emacs.d/build/emms"
-EMMS_EXEC="${ARCH_BIN}/emms-print-metadata"
+EMMS_EXEC="${LOCAL_BIN}/emms-print-metadata"
 
 if [[ -x "${EMMS_EXEC}" ]]; then
     exit 0

bin/executable_install_emms-print-metadata.sh

@@ -44,13 +44,13 @@ WORKDIR /home/$USERNAME
 COPY --chown=$USERNAME:$USERNAME ../bin/executable_install_bootstrap_dependencies.sh /tmp/install_bootstrap.sh
 RUN bash /tmp/install_bootstrap.sh && rm /tmp/install_bootstrap.sh
 
-# Ensure chezmoi is in PATH (arch-specific first, then legacy)
-RUN ARCH=$(uname -m) && echo "export PATH=\"\$HOME/.local/\${ARCH}/bin:\$HOME/.local/bin:\$PATH\"" >> $HOME/.profile
-ENV PATH="/home/$USERNAME/.local/bin:${PATH}"
+# Ensure local bin is in PATH for runtime
+RUN echo 'export PATH="$HOME/.local/bin:$PATH"' >> $HOME/.profile
 
 # Initialize chezmoi with dotfiles from GitHub
-RUN chezmoi init https://github.com/marchdf/dotfiles.git \
-    --promptBool test_machine=f,"Use ZSH_ROOT_DIR for tmux shell"=f,use_large_install_dir=f \
+RUN source $HOME/.profile && \
+    chezmoi init https://github.com/marchdf/dotfiles.git \
+    --promptBool test_machine=f,"Use ZSH_ROOT_DIR for tmux shell"=f \
     --promptString email="marchdf@docker-container.com" \
     && chezmoi apply
 

docker/Dockerfile

@@ -62,13 +62,12 @@ RUN if ! getent group $USER_GID > /dev/null 2>&1; then groupadd --gid $USER_GID
 USER $USERNAME
 WORKDIR /home/$USERNAME
 
-# Install chezmoi to arch-specific bin
-RUN ARCH=$(uname -m) && \
-    mkdir -p $HOME/.local/${ARCH}/bin && \
-    sh -c "$(curl -fsLS get.chezmoi.io)" -- -b $HOME/.local/${ARCH}/bin
+# Install chezmoi
+RUN mkdir -p $HOME/.local/bin && \
+    sh -c "$(curl -fsLS get.chezmoi.io)" -- -b $HOME/.local/bin
 
-# Ensure tools are in PATH (arch-specific first, then legacy)
-RUN ARCH=$(uname -m) && echo "export PATH=\"\$HOME/.local/\${ARCH}/bin:\$HOME/.local/bin:\$PATH\"" >> $HOME/.profile
+# Ensure local bin is in PATH
+RUN echo 'export PATH="$HOME/.local/bin:$PATH"' >> $HOME/.profile
 ENV PATH="/home/$USERNAME/.local/bin:${PATH}"
 
 # Create directory structure for chezmoi source symlink

docker/Dockerfile.test

@@ -23,7 +23,7 @@ docker compose run --rm ubuntu-test
 
 # Inside container - first time setup:
 chezmoi init --source /dotfiles-source \
-    --promptBool test_machine=f,"Use ZSH_ROOT_DIR for tmux shell"=f,use_large_install_dir=f \
+    --promptBool test_machine=f,"Use ZSH_ROOT_DIR for tmux shell"=f \
     --promptString email="marchdf@docker-container.com"
 chezmoi apply