diff options
| author | 2026-05-20 13:56:09 +0100 | |
|---|---|---|
| committer | 2026-05-20 13:56:09 +0100 | |
| commit | de5146c7976e1fb38e8d1f82c30544462d881100 (patch) | |
| tree | 2de6f2358d6b83b2f64b68fe105ed11d4ff0feea /remote-dev/bootstrap.sh | |
| parent | 52e53ad7956f637af3bb87de79934bfda4b74a2e (diff) | |
| download | dotfiles-de5146c7976e1fb38e8d1f82c30544462d881100.tar.gz dotfiles-de5146c7976e1fb38e8d1f82c30544462d881100.tar.bz2 dotfiles-de5146c7976e1fb38e8d1f82c30544462d881100.zip | |
refactor(nix): promote remote-dev/ to nix/ with common/vm/host split
Restructures the Home-Manager profile to support both the Arch host and
the Ubuntu remote-dev VM from the same flake.
- remote-dev/ → nix/ (hard rename; .chezmoiignore updated)
- home.nix split into common.nix (shared), vm.nix (Mason runtime
carve-outs + podman stack), host.nix (gpg scdaemon delegation to
system pcscd)
- flake.nix exposes homeConfigurations.{vm,host} via a mkProfile
helper
- rj alias in dot_zshrc updated to ~/.local/share/dotfiles/nix
- bootstrap.sh / justfile updated to use #vm against the new path
The split is behaviour-preserving for the VM: vm.nix + common.nix
together carry the same package set as the previous home.nix.
host.nix is provisioned but not yet wired into bootstrap (phase p8).
Phase 1 of the nix-on-host migration plan.
Diffstat (limited to 'remote-dev/bootstrap.sh')
| -rwxr-xr-x | remote-dev/bootstrap.sh | 111 |
1 files changed, 0 insertions, 111 deletions
diff --git a/remote-dev/bootstrap.sh b/remote-dev/bootstrap.sh deleted file mode 100755 index 1b7dafe..0000000 --- a/remote-dev/bootstrap.sh +++ /dev/null @@ -1,111 +0,0 @@ -#!/usr/bin/env sh -# Bootstrap a headless dev environment on a fresh Ubuntu 22.04 VM. -# Idempotent: safe to re-run. -# -# curl -fsSL https://raw.githubusercontent.com/<user>/dotfiles/master/remote-dev/bootstrap.sh | sh -# -# Steps: -# 1. Install Nix (Determinate Systems installer, multi-user). -# 2. Clone (or fast-forward) the dotfiles repo to ~/.local/share/dotfiles. -# 3. Run `home-manager switch --flake .../remote-dev#vm`. -# 4. Install python3.11 via `uv` (needed by Mason pip installs). -# 5. Add Nix-store zsh to /etc/shells and chsh the user. -# -# Environment overrides: -# DOTFILES_REPO Git URL (default: https://github.com/ruifm/dotfiles) -# DOTFILES_REF Branch/tag/sha (default: master) -# DOTFILES_DIR Checkout path (default: $HOME/.local/share/dotfiles) - -set -eu - -REPO="${DOTFILES_REPO:-https://github.com/sommerfelddev/dotfiles}" -REF="${DOTFILES_REF:-master}" -DIR="${DOTFILES_DIR:-$HOME/.local/share/dotfiles}" - -log() { printf '\033[1;32m==>\033[0m %s\n' "$*"; } -err() { printf '\033[1;31m==>\033[0m %s\n' "$*" >&2; } - -# ── 1. Nix ──────────────────────────────────────────────────────────────────── -if ! command -v nix >/dev/null 2>&1; then - log "Installing Nix (Determinate Systems installer)…" - curl --proto '=https' --tlsv1.2 -sSf -L \ - https://install.determinate.systems/nix | - sh -s -- install linux --no-confirm -else - log "Nix already installed, skipping installer." -fi - -# ── 1b. (moved to step 4 — uv comes from the nix profile, only available -# after `home-manager switch`) ───────────────────────────────────────── - -# Source nix env for the rest of this script (installer writes -# /etc/profile.d/nix.sh but the current shell hasn't sourced it). -if [ -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh ]; then - # shellcheck disable=SC1091 - . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh -fi - -# ── 2. Repo checkout ───────────────────────────────────────────────────────── -if ! command -v git >/dev/null 2>&1; then - log "Bootstrapping git via nix profile…" - nix profile install nixpkgs#git -fi - -if [ -d "$DIR/.git" ]; then - log "Updating existing checkout at $DIR…" - git -C "$DIR" fetch origin "$REF" - git -C "$DIR" checkout "$REF" - git -C "$DIR" pull --ff-only -else - log "Cloning $REPO ($REF) → $DIR…" - mkdir -p "$(dirname "$DIR")" - git clone --branch "$REF" "$REPO" "$DIR" -fi - -# ── 3. Home-Manager switch ─────────────────────────────────────────────────── -log "Running home-manager switch (this can take a while on first run)…" -nix --extra-experimental-features 'nix-command flakes' \ - run home-manager/master -- \ - switch --impure --flake "$DIR/remote-dev#vm" -b backup - -# ── 4. Mason's python interpreter (via uv from the nix profile) ────────────── -# Mason installs some LSPs/linters into per-package pip venvs. We need a -# python3.11 that: -# (a) meets Mason's >=3.10 version requirement (Ubuntu 20.04 ships -# /usr/bin/python3 = 3.8 — too old), and -# (b) accepts manylinux wheels (Nix's python rejects them by design; -# pip then falls back to compiling `nodejs-wheel-binaries` from -# source, which fails on the host's gcc 9.4 — needs C++20). -# -# `uv python install 3.11` fetches a portable CPython build (python-build- -# standalone, manylinux-compatible) into ~/.local/share/uv/python/. We -# symlink its `python3.11` into ~/.local/bin/ (already on PATH from -# zprofile) so Mason discovers it. Does NOT shadow /usr/bin/python3 — -# leaf-tools policy intact. Works on any distro/release, no PPA required. -UV_BIN="$HOME/.nix-profile/bin/uv" -if [ -x "$UV_BIN" ]; then - if [ ! -x "$HOME/.local/bin/python3.11" ]; then - log "Installing python3.11 via uv (required for Mason pip installs)…" - "$UV_BIN" python install 3.11 - UV_PY311="$("$UV_BIN" python find 3.11)" - mkdir -p "$HOME/.local/bin" - ln -sf "$UV_PY311" "$HOME/.local/bin/python3.11" - fi -fi - -# ── 5. chsh to nix-store zsh ───────────────────────────────────────────────── -NIX_ZSH="$HOME/.nix-profile/bin/zsh" -if [ -x "$NIX_ZSH" ]; then - if ! grep -qxF "$NIX_ZSH" /etc/shells 2>/dev/null; then - log "Appending $NIX_ZSH to /etc/shells (requires sudo)…" - echo "$NIX_ZSH" | sudo tee -a /etc/shells >/dev/null - fi - current_shell="$(getent passwd "$USER" | cut -d: -f7)" - if [ "$current_shell" != "$NIX_ZSH" ]; then - log "Changing login shell to $NIX_ZSH (requires sudo)…" - sudo chsh -s "$NIX_ZSH" "$USER" - fi -fi - -log "Done. Log out and back in for the new shell to take effect." -log "Then run 'nvim' once to let it fetch plugins on first launch." |
