Merge release/1.0.0 into main

gitconfig sets core.pager = delta; without the binary git cannot page.

.claude/memory/blockers.md

@@ -43,3 +43,7 @@ ensure_rdp_credentials (prompt, TTY-guarded, idempotent). Supersedes BLK-003 (xr
 identified (guard-bash hook vs auto-mode classifier). Workaround: read unit files under /usr/lib/systemd +
 /etc/systemd directly, `ls`/`du` on literal paths, no `find -exec`, no `sudo`. Cost ≈ 5 retries. Candidate fix:
 allowlist `systemctl {cat,show,is-enabled,is-active,status}` wherever the denial comes from.
+
+## BLK-007 — remote-install.sh + README one-liner point at branch `master` — OPEN
+2026-10-05. `BRANCH="${BRANCH:-master}"` + README raw URLs `/branch/master/`, but repo = main/develop (gitflow) →
+curl|bash one-liner 404 / clone fails. Fix: default `main`, update URLs. Not fixed (out of macOS scope).

.claude/memory/decisions.md

@@ -108,3 +108,26 @@ never banned); 5/10m/1h from RECOVERY doc 01. (2) `20auto-upgrades` file instead
 install continues. Declined by user: auditd rules, ufw whitelist (site-specific ports, lockout risk → would be an
 offer, not systematic). Not included by design: PasswordAuthentication no / AllowUsers / X11Forwarding no
 (lockout or workflow risk). Status: done in repo (feature/security-baseline), live apply = user.
+
+## BDR-014 — install.sh mirrors machine apt set: GNOME + LAMP unconditional, NVIDIA via ubuntu-drivers
+2026-09-28. Source: `apt-mark showmanual` + /var/log/apt/history.log diffed vs script. Added gitleaks, web stack
+(mariadb-server imagemagick php-* unversioned → follows distro PHP), ubuntu-desktop-minimal before RDP setup
+(gnome-remote-desktop needs GDM, bare server had none), `install_nvidia_driver()` = `lspci -d 10de:` gate +
+`ubuntu-drivers install` (distro-recommended, 595-open today). Alternatives rejected: pin nvidia-driver-595-open
+(ages, hardware-bound), LAMP behind confirm() offer (user: base list), GNOME left implicit (RDP fails silently).
+Status: merged to develop. Live rerun of install.sh = user.
+
+## BDR-015 — macOS: Homebrew replaces apt, Docker via colima, login shell bash 5 OR zsh (user choice)
+2026-10-05. install.sh Darwin branch: ensure_homebrew (official script if missing) → brew update/upgrade → apt list
+mapped to formulae. Docker = colima + docker/compose/buildx CLI (`cliPluginsExtraDirs` written only if
+~/.docker/config.json absent). colima/code-server/mariadb = `brew services` (skip if started). Shell asked first
+(`MACOS_SHELL` presets, no TTY → bash): bash → brew bash 5 in /etc/shells + chsh (macOS bash 3.2 too old: no
+EPOCHREALTIME, HISTSIZE=-1); zsh → oh-my-zsh unattended + zsh/zshrc-osx + bchanot.zsh-theme (bash prompt port), chsh
+/bin/zsh. End: print_macos_gaps lists Linux-only items skipped. Alts rejected: Docker Desktop (GUI, licence), no
+Docker; staying on zsh w/o config. Status: merged develop 7d5dabd.
+
+## BDR-016 — ~/.zshrc backed up to ~/.zshrc.backup-<date>, not ~/Oldconfig
+2026-10-05. ~/Oldconfig is `rm -rf` at every run → 2nd run destroys 1st-run backup of user's real zshrc (nvm, bun
+lines). deploy_zsh_config: if ~/.zshrc differs from repo copy (cmp -s) → timestamped mv in $HOME; identical → no
+backup (rerun no dup). Machine-specific lines → ~/.zshrc.local (sourced). Same flaw still on .bashrc/.vim (open,
+not fixed). Status: done.

.claude/memory/journal.md

@@ -63,3 +63,24 @@ Later same day: security baseline always-on in install.sh (fail2ban all-ports +
 upgrades file, sshd limits drop-in sshd -t gated) on feature/security-baseline (BDR-013, LRN-012: old jail
 banned 22 not 337). auditd + ufw declined. shellcheck/bash -n CLEAN, stub harness incl. sshd -t reject path,
 configparser + apt-config checks. Branch pushed, NOT finished (no merge signal). Live apply = user runbook.
+Update: user said merge → feature/security-baseline finished via lib, develop a6c416e pushed.
+Cleanup: user asked all-in-develop + delete branches. Hooks refresh committed (a42e8f6). All 3 remote feature
+branches verified merged; `git push --delete` DENIED by permission layer → user runs it. gitea-deploy/ (untracked
+Gitea server deploy project, 31 files, no secrets) moved to ~/Documents/gitea-deploy, own repo via gitflow init,
+pushed main+develop to git.bchanot.fr (push-to-create worked). deploy.conf gitignored.
+
+## 2026-09-28
+- feature/apt-packages (0bc9e3f, unmerged): install.sh mirrors machine apt set. Diff `apt-mark showmanual` +
+apt history vs script → added gitleaks, web stack (mariadb-server imagemagick php-* unversioned),
+ubuntu-desktop-minimal before RDP, install_nvidia_driver() (lspci 10de gate, `ubuntu-drivers install`, no pin).
+User approved 3 choices (GNOME in, ubuntu-drivers, LAMP unconditional). shellcheck + bash -n + stub run OK.
+- Blocked mid-commit: lib pre-commit ran `gitleaks git --staged`, Ubuntu apt gitleaks = 8.16 (no `git` subcmd,
+exit 1 read as leak). Fixed in claude-config bugfix/gitleaks-protect-fallback (347073a, unmerged): probe
+`gitleaks git --help`, fallback `protect --staged`; T16c symlink-farm PATH. make test 0. Hooks refreshed here (9e49b9d).
+- Note: `gh` in install.sh list but not installed on this box (script not rerun since added).
+
+## 2026-10-05 — macOS support + zsh/bash choice
+Local main 15 commits behind develop → worked off develop. install.sh Darwin branch (Homebrew, colima, brew services,
+gaps report), bashrc-osx = bashrc-linux + macOS deltas, dt portable, zsh option (oh-my-zsh + bchanot theme). Tested:
+shellcheck, bash 3.2/5 + zsh -n, bashrc/zshrc/theme live in shells, dt with real dtach session, stub harness both
+choices. Full install.sh not run on this Mac. BDR-015/016, LRN-014, BLK-007. Merged develop 7d5dabd, not pushed.

.claude/memory/learnings.md

@@ -93,3 +93,18 @@ templating, drifts if port changes) or `banaction = %(banaction_allports)s` (off
 irrelevant) — chose allports. Offline checks without fail2ban installed: python `configparser` with
 BasicInterpolation resolves `%(x)s` refs and proves the file parses; apt.conf → `apt-config
 --config-file=<f> dump APT::Periodic`. sshd drop-ins can't be `sshd -t`-tested without root (host keys).
+
+## LRN-013 — distro package lags upstream: probe subcommand before calling it
+2026-09-28. Ubuntu apt gitleaks = 8.16; lib pre-commit hook written for >= 8.19 (`gitleaks git --staged`).
+"unknown command" exit 1 read as a leak → every commit blocked, silently (stderr swallowed). Script calling a
+subcommand born in version N must probe `tool sub --help` and fall back (`protect --staged`). Test faking
+"binary absent" via shorter PATH (`/usr/bin:/bin`) breaks once the binary lives in /usr/bin: symlink farm of
+/usr/bin minus the binary instead. Apply: any tool install.sh pulls from apt while ~/.claude scripts assume
+the upstream release. Fix: claude-config bugfix/gitleaks-protect-fallback.
+
+## LRN-014 — macOS (BSD/bash 3.2) traps for Linux shell scripts
+2026-10-05. `cp -u` absent on BSD cp → `cp -Rp`. BSD `date` no `%N` → bash 5 `$EPOCHREALTIME` (strip `[.,]`, fr
+locale = comma); no `date -d` → `date -j -f '%a %b %e %T %Y'` with `LC_ALL=C ps -o lstart=`. No /proc → cwd via
+`lsof -a -p PID -d cwd -Fn`. bash 3.2 `${x/#$HOME/\~}` keeps backslash → use var `tilde='~'`. BSD sed no `\?` in BRE
+→ `sed -E`. Terminal.app = LOGIN shells → read ~/.bash_profile only → must source ~/.bashrc. `ls --color` → `ls -G`.
+zsh: `status` is read-only special var, don't name locals that. Verify installer fns via stub harness (LRN-011).

.claude/tasks/TODO.md

@@ -60,3 +60,42 @@ Branch: feature/security-baseline (off develop). Scope approved: fail2ban, unatt
 - [x] README.md (table, step 13, packages) + CLAUDE.md layout
 - [x] shellcheck + bash -n; stub harness harden_sshd (accept / reject paths); configparser check of jail file
 - [x] commit; registries (BDR-013, LRN-012); runbook. No finish without explicit signal.
+
+## Feature — install.sh mirrors this machine's apt packages (2026-09-28)
+Branch: feature/apt-packages (off develop). Source: apt-mark showmanual + /var/log/apt/history.log diffed against install.sh.
+- [x] gitleaks in the base list (backs the pre-commit hook)
+- [x] web stack group: mariadb-server imagemagick + unversioned php-* modules (approved: base list, not an offer)
+- [x] ubuntu-desktop-minimal before setup_remote_desktop (approved)
+- [x] install_nvidia_driver(): lspci vendor 10de gate + ubuntu-drivers install (approved: no version pin)
+- [x] README steps 11 + packages; shellcheck + bash -n; stub run of the NVIDIA helper
+- [x] commit on the feature branch. No finish without explicit signal.
+
+## Feature — macOS support, parity with Linux minus apt (2026-10-05)
+Branch: feature/macos-support (off develop). User choices: Docker = colima + CLI; login shell → brew bash 5.
+- [x] install.sh: Darwin block — ensure Homebrew, brew update/upgrade, brew formula list mirroring apt list
+- [x] install.sh: colima + docker CLI (compose/buildx plugin dir), code-server + mariadb via brew services
+- [x] install.sh: brew bash → /etc/shells + chsh; ~/.bash_profile sources ~/.bashrc (Terminal = login shell)
+- [x] install.sh: `cp -rupv` → `cp -Rpv` (BSD cp has no -u; target dir is fresh anyway)
+- [x] install.sh: end-of-run report of Linux items not installed on macOS
+- [x] bash/bashrc-osx: mirror bashrc-linux (ls -G, brew shellenv, EPOCHREALTIME timer, dtach_claude w/o systemd-run)
+- [x] bin/dt: portable _cwd_of (lsof) + _starttime_of (BSD date), help sed -E
+- [x] README + CLAUDE.md macOS section
+- [x] shellcheck + bash -n; runtime test bashrc-osx + dt on this Mac; stub run of Darwin block
+
+## Feature — macOS: choose zsh (oh-my-zsh) or bash as login shell (2026-10-05)
+Same branch. Prompt at start of Darwin block (MACOS_SHELL=bash|zsh env overrides, no TTY → bash).
+- [x] zsh/zshrc-osx: brew env, PATH, history, GCC_COLORS, VIUSER, cc/d + dtach-router, oh-my-zsh, ~/.zshrc.local hook
+- [x] zsh/bchanot.zsh-theme: same prompt as bashrc (✔/✘ + timer, user [ cwd ], git [branch -*+], root red)
+- [x] install.sh: choose_macos_shell, install_oh_my_zsh (unattended, keep zshrc), deploy_zsh_config (backup → Oldconfig)
+- [x] install.sh: use_brew_bash_login_shell → set_login_shell <path>, called at end with chosen shell
+- [x] README + CLAUDE.md
+- [x] shellcheck/bash -n/zsh -n; runtime: theme in zsh (prompt render, timer, git bits), dtach-router sourced in zsh; harness both choices
+
+## Feature — user-scope ~/.gitconfig from repo template, VIUSER/VIMAIL → USER/EMAIL (2026-10-06)
+- [x] rc files (bashrc-linux, bashrc-osx, zshrc-osx): `VIUSER`/`VIMAIL` → `USER`/`EMAIL`
+- [x] `gitconfig` template: git never expands `$VAR` → `@USER@`/`@EMAIL@` placeholders, `excludesfile = ~/.gitignore`
+- [x] install.sh `deploy_gitconfig`: values read from deployed bashrc, rendered → ~/.gitconfig, differing old one → ~/.gitconfig.backup-<date>
+- [x] install.sh: `$USER` → `$(id -un)` (dscl, code-server unit): rc now overrides USER with identity
+- [x] README + CLAUDE.md layout
+- [x] Verify: shellcheck, bash -n, render to temp HOME, `git config --file` reads values
+- [x] `git-delta` added to apt + brew lists (gitconfig pager = delta)

.githooks/post-commit

@@ -0,0 +1,16 @@
+#!/bin/sh
+# gitflow post-commit — generated by gitflow_init. Do not hand-edit.
+hook=post-commit
+# Pushes every commit as it lands (BDR-095): a remote only backs up what it
+# holds. Never fails the commit: no origin / offline / refused → warning only.
+# Opt out for one command with GITFLOW_NO_PUSH=1 (throwaway repos, tests).
+[ "${GITFLOW_NO_PUSH:-0}" = 1 ] && exit 0
+# Per-repo opt-out (no push rights on a foreign clone): git config gitflow.autopush false
+[ "$(git config --bool --default true gitflow.autopush)" = false ] && exit 0
+git remote get-url origin >/dev/null 2>&1 || exit 0
+br=$(git symbolic-ref --short -q HEAD 2>/dev/null) || exit 0   # detached HEAD — nothing to track
+if command -v timeout >/dev/null 2>&1; then t="timeout ${GITFLOW_PUSH_TIMEOUT:-30}"; else t=""; fi
+if $t git push -q -u --follow-tags origin "$br" >/dev/null 2>&1; then exit 0; fi
+echo "gitflow $hook: push of '$br' FAILED — this commit exists only on this disk." >&2
+echo "  Push by hand: git push -u origin $br   (rejected as non-fast-forward? never force-push; ask first)" >&2
+exit 0

.githooks/post-merge

@@ -0,0 +1,16 @@
+#!/bin/sh
+# gitflow post-merge — generated by gitflow_init. Do not hand-edit.
+hook=post-merge
+# Pushes every commit as it lands (BDR-095): a remote only backs up what it
+# holds. Never fails the commit: no origin / offline / refused → warning only.
+# Opt out for one command with GITFLOW_NO_PUSH=1 (throwaway repos, tests).
+[ "${GITFLOW_NO_PUSH:-0}" = 1 ] && exit 0
+# Per-repo opt-out (no push rights on a foreign clone): git config gitflow.autopush false
+[ "$(git config --bool --default true gitflow.autopush)" = false ] && exit 0
+git remote get-url origin >/dev/null 2>&1 || exit 0
+br=$(git symbolic-ref --short -q HEAD 2>/dev/null) || exit 0   # detached HEAD — nothing to track
+if command -v timeout >/dev/null 2>&1; then t="timeout ${GITFLOW_PUSH_TIMEOUT:-30}"; else t=""; fi
+if $t git push -q -u --follow-tags origin "$br" >/dev/null 2>&1; then exit 0; fi
+echo "gitflow $hook: push of '$br' FAILED — this commit exists only on this disk." >&2
+echo "  Push by hand: git push -u origin $br   (rejected as non-fast-forward? never force-push; ask first)" >&2
+exit 0

.githooks/pre-commit

@@ -7,17 +7,40 @@ br=$(git symbolic-ref --short -q HEAD 2>/dev/null)
 git rev-parse --verify -q HEAD >/dev/null 2>&1 || exit 0   # root commit — allow
 [ -f "$gd/MERGE_HEAD" ] && exit 0                          # merge in progress — allow
 
+# Secret backstop (job7) — any branch, not just protected ones. Non-blocking
+# if gitleaks isn't installed; auto-discovers ./.gitleaks.toml (repo root).
+# gitleaks >= 8.19 scans the index with `git --staged`; older builds (Ubuntu's
+# 8.16 package) only know `protect --staged`, and `git` exits 1 there as an
+# unknown command — which would block every commit. Probe the subcommand first.
+if command -v gitleaks >/dev/null 2>&1; then
+  gl_sub=git
+  gitleaks git --help >/dev/null 2>&1 || gl_sub=protect
+  if ! gitleaks "$gl_sub" --staged --no-banner >/dev/null 2>&1; then
+    echo "gitflow pre-commit: BLOCKED — gitleaks found a secret in staged changes." >&2
+    echo "  Details: gitleaks $gl_sub --staged --no-banner" >&2
+    echo "  Genuine false-positive? add an allowlist rule to .gitleaks.toml — never bypass with --no-verify." >&2
+    exit 1
+  fi
+else
+  echo "gitflow pre-commit: gitleaks not installed — secret scan skipped (https://github.com/gitleaks/gitleaks)." >&2
+fi
+
+# Per-repo opt-out of the branch model (a clone of a foreign project):
+#   git config gitflow.protect false
+[ "$(git config --bool --default true gitflow.protect)" = false ] && exit 0
+
 case "$br" in
   main|develop) ;;                        # protected — keep checking
   *) exit 0 ;;                                              # working branch — allow
 esac
 
-# whitelist: all-staged-under-.claude/ (memory/doc/deploy helpers) — allow
-if [ -z "$(git diff --cached --name-only | grep -v '^\.claude/' | head -1)" ]; then
+# whitelist: all-staged-under-.claude/ (memory/doc/deploy helpers) or
+# .githooks/ (the hooks themselves, refreshed by the lib) — allow
+if [ -z "$(git diff --cached --name-only | grep -vE '^\.(claude|githooks)/' | head -1)" ]; then
   exit 0
 fi
 
 echo "gitflow pre-commit: BLOCKED — direct commit on '$br'." >&2
 echo "  Branch from the right base (feature/bugfix->develop, hotfix->main), or merge." >&2
-echo "  (.claude/** memory commits are exempt; --no-verify bypasses locally.)" >&2
+echo "  (.claude/** and .githooks/** commits are exempt; foreign clone? git config gitflow.protect false)" >&2
 exit 1

.githooks/reference-transaction

@@ -0,0 +1,15 @@
+#!/bin/sh
+# gitflow reference-transaction — generated by gitflow_init. Do not hand-edit.
+# Refuses deleting (or renaming) main / develop, whatever the
+# command. Mirrors gitflow_protected_base (lib/gitflow.sh).
+[ "$1" = prepared ] || exit 0
+while read -r _old new ref; do
+  case "$ref" in refs/heads/main|refs/heads/develop) ;; *) continue ;; esac
+  case "$new" in *[!0]*) continue ;; esac     # new value not all-zeros → an update, not a deletion
+  # Per-repo opt-out (a foreign clone): git config gitflow.protect false
+  [ "$(git config --bool --default true gitflow.protect)" = false ] && exit 0
+  echo "gitflow reference-transaction: BLOCKED — deleting '$ref', a protected base." >&2
+  echo "  main and develop are never deleted or renamed. A merged working branch: gitflow.sh delete <branch>" >&2
+  exit 1
+done
+exit 0

CHANGELOG.md

@@ -0,0 +1,39 @@
+# Changelog
+
+All notable changes to this project are documented here.
+Format: [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). Versioning: semver.
+
+## [Unreleased]
+
+## [1.0.0] — 2026-10-06
+
+### Added
+- macOS support in `install.sh`: Homebrew instead of apt, colima for Docker,
+  brew services for code-server/mariadb, bash or zsh login shell choice
+  (`MACOS_SHELL`), report of the Linux-only items skipped.
+- `bash/bashrc-osx`: `bashrc-linux` mirrored with the macOS deltas (brew env,
+  `ls -G`, `EPOCHREALTIME` timer, `cc` without systemd-run).
+- `zsh/zshrc-osx` + `zsh/bchanot.zsh-theme`: oh-my-zsh config and theme
+  porting the bash prompt.
+- `gitconfig` template deployed as user-scope `~/.gitconfig`, `@USER@` /
+  `@EMAIL@` filled at install; a differing file is kept as
+  `~/.gitconfig.backup-<date>`.
+- `git-delta` in the apt and brew package lists (the gitconfig pager).
+- Security baseline on Linux, always applied and idempotent: fail2ban sshd
+  jail (journal backend, all-ports ban, LAN ignored), unattended security
+  upgrades, sshd hardening drop-in gated by `sshd -t`.
+- End-of-install offers on Linux: `/tmp` on disk (mask `tmp.mount` +
+  tmpfiles rules) and SSH memory guard (sshd OOM-exempt drop-in + earlyoom).
+- `cloudpex/`: on-demand SMB mount helper, installer and FR README; site
+  values prompted at install into `/etc/cloudpex.conf`, never in the script.
+- Apt package list mirroring the reference machine: gitleaks, web stack,
+  `ubuntu-desktop-minimal`, lspci-gated NVIDIA driver install, `gh`.
+
+### Changed
+- Shell identity exported as `USER` / `EMAIL` instead of `VIUSER` / `VIMAIL`
+  in every rc file; the installer takes the login name from `id -un`.
+- `install.sh` uses `cp -Rpv` (BSD-compatible).
+
+### Fixed
+- `bin/dt` macOS portability: `lsof` cwd, BSD `date` start time, bash 3.2
+  tilde expansion, `sed -E` help.

CLAUDE.md

@@ -20,7 +20,9 @@ install.sh            one-shot installer (OS auto-detected)
 vim/vimrc             vim config (pathogen, molokai, syntastic, NERDTree)
 vim/autoload/         pathogen loader (committed)
 vim/colors/           molokai colorscheme (committed)
-bash/bashrc-{linux,osx}          OS-detected bashrc
+bash/bashrc-{linux,osx}          OS-detected bashrc (exports USER/EMAIL identity)
+gitconfig                        user-scope ~/.gitconfig template, @USER@/@EMAIL@ filled at install
+zsh/{zshrc-osx,bchanot.zsh-theme}  macOS zsh option: oh-my-zsh zshrc + theme porting the bash prompt
 bin/{dt,dtach-router,claude-provider}   CLI scripts deployed to ~/.local/bin
 etc/profile.d/disk-usage-warning.sh     login-time low-disk warning → /etc/profile.d (Linux only)
 etc/tmpfiles.d/tmp.conf                 disk-backed /tmp cleanup rules (offer: /tmp on disk)
@@ -37,6 +39,12 @@ cloudpex/{cloudpex,install.sh,README.md} on-demand SMB mount helper → /usr/loc
 `/tmp` is a RAM-backed tmpfs on Ubuntu (50% of RAM): agent runs fill it, which is why
 install.sh offers to mask `tmp.mount`. Swap is not the fix (the cap and ENOSPC stay).
 
+macOS: install.sh swaps apt-get for Homebrew (colima for Docker, brew services for
+code-server/mariadb, `~/.bash_profile` → `~/.bashrc`), asks bash or zsh (`MACOS_SHELL`
+presets it; zsh = oh-my-zsh + `zsh/` files, bash = brew bash 5) and prints the Linux-only
+items it skipped. Keep `bashrc-osx` = `bashrc-linux` + macOS deltas only, and the zsh
+files in step with them (same env, aliases, prompt).
+
 `pymupdf`/`markdown_py` are NOT tracked — they are pipx entry-point shims,
 recreated by `pipx install PyMuPDF Markdown` in install.sh.
 `claude-provider` reads `$OPENROUTER_API_KEY` from the env — never hardcode it (the

README.md

@@ -16,7 +16,7 @@ curl -fsSL https://git.bchanot.fr/bchanot/config/raw/branch/master/remote-instal
 
 | Path                 | Purpose                                                        |
 | -------------------- | -------------------------------------------------------------- |
-| `install.sh`         | Installs apt packages + Docker + code-server + RDP (gnome-remote-desktop), backs up old config, deploys vim + bashrc (OS-detected), installs CLI scripts, pipx tools, a low-disk login warning and the `cloudpex` NAS mount helper; ends by offering two system changes (`/tmp` on disk, SSH memory guard). |
+| `install.sh`         | Linux: installs apt packages + Docker + code-server + RDP (gnome-remote-desktop), backs up old config, deploys vim + bashrc (OS-detected), installs CLI scripts, pipx tools, a low-disk login warning and the `cloudpex` NAS mount helper; ends by offering two system changes (`/tmp` on disk, SSH memory guard). macOS: same tooling through Homebrew (see [macOS](#macos)), then prints what was not installed compared with Linux. |
 | `cloudpex/`          | On-demand SMB mount of a NAS share (`cloudpex` command + its installer). Site values (host, share, SMB user, mount point, SMB version) are prompted at install and stored in `/etc/cloudpex.conf`, never in the script. French README inside. |
 | `etc/tmpfiles.d/tmp.conf` | Cleanup rules for a disk-backed `/tmp` (wiped at boot, 10-day purge). Deployed by the `/tmp` on disk offer. |
 | `etc/systemd/ssh.service.d/override.conf` | `ssh.service` drop-in: sshd exempt from the OOM killer + memory reclaim protection. Deployed by the SSH memory guard offer. |
@@ -27,8 +27,11 @@ curl -fsSL https://git.bchanot.fr/bchanot/config/raw/branch/master/remote-instal
 | `vim/vimrc`          | Vim config: pathogen, molokai, syntastic (C with `-Wall -Werror -Wextra`), NERDTree, 42-style canonical class generators (`:ClassH`, `:ClassC`). |
 | `vim/autoload/`      | `pathogen.vim` plugin loader (committed).                      |
 | `vim/colors/`        | `molokai.vim` colorscheme (committed).                         |
+| `gitconfig`          | Template of the user-scope `~/.gitconfig`. `@USER@` and `@EMAIL@` are filled at install with the `USER` and `EMAIL` exported by the bashrc (git never expands `$VARS` itself). |
 | `bash/bashrc-linux`  | bashrc for desktop Linux (git-aware prompt + command timer).   |
-| `bash/bashrc-osx`    | bashrc for macOS.                                              |
+| `bash/bashrc-osx`    | bashrc for macOS: `bashrc-linux` adapted (Homebrew on `PATH`, BSD `ls -G`, bash 5 clock for the timer, `cc` without `systemd-run`). |
+| `zsh/zshrc-osx`      | zshrc for macOS when zsh is chosen: oh-my-zsh + the same env, aliases and dtach menu as `bashrc-osx`. Loads `~/.zshrc.local` for machine-specific lines. |
+| `zsh/bchanot.zsh-theme` | oh-my-zsh theme reproducing the bash prompt: `✔ (12ms) user [ ~/dir ] [branch -*+] >`. |
 | `bin/dt`             | dtach session manager for claude-in-dtach sessions.            |
 | `bin/dtach-router`   | Dashboard to resume dtach sessions, shown at the start of every interactive shell (wired into `~/.bashrc` by the installer). |
 | `bin/claude-provider`| Switch Claude Code between Anthropic and OpenRouter.           |
@@ -57,17 +60,17 @@ No argument — the OS is auto-detected.
 
 What it does:
 
-1. On Debian/Ubuntu, installs a set of CLI/dev packages via `apt-get` (see below). Skipped automatically where `apt-get` is absent (macOS).
+1. On Debian/Ubuntu, installs a set of CLI/dev packages via `apt-get` (see below). On macOS, Homebrew does it instead: see [macOS](#macos).
 2. Sets up Docker's official apt repo (Ubuntu) and installs the engine + compose plugin — skipped if `docker` is already present.
 3. Moves any existing `~/.vim`, `~/.vimrc`, `~/.bashrc`, `~/.Sublivim` to `~/Oldconfig`.
 4. Clones the `syntastic` and `nerdtree` vim plugins into `~/.vim/bundle/`.
 5. Copies the tracked vim files into `~/.vim` and symlinks `~/.vimrc`.
-6. Picks the bashrc by OS: macOS → `bashrc-osx` (falls back to `bashrc-linux` if missing), everything else → `bashrc-linux`. Copies it to `~/.bashrc`.
+6. Picks the bashrc by OS: macOS → `bashrc-osx` (falls back to `bashrc-linux` if missing), everything else → `bashrc-linux`. Copies it to `~/.bashrc`. Then renders `gitconfig` into `~/.gitconfig` with that bashrc's `USER` / `EMAIL`. A different existing `~/.gitconfig` is saved as `~/.gitconfig.backup-<date>`; an identical one is left alone. It is the global level only: a repo's own `.git/config` still overrides it. `core.excludesfile` points at `~/.gitignore`, ignored by git when the file does not exist.
 7. Installs Python CLIs via `pipx` (`PyMuPDF` → `pymupdf`, `Markdown` → `markdown_py`) — skipped if `pipx` is absent.
-8. Copies the `bin/` scripts (`dt`, `dtach-router`, `claude-provider`) into `~/.local/bin`. The dtach session-resume menu ships in the deployed `bashrc-linux`, so every interactive shell offers it — including VS Code Remote-SSH terminals, which are non-login and never read `~/.profile`. The installer also strips any older dtach block left in `~/.profile` so a plain SSH login doesn't prompt twice.
+8. Copies the `bin/` scripts (`dt`, `dtach-router`, `claude-provider`) into `~/.local/bin`. The dtach session-resume menu ships in the deployed bashrc (both OSes), so every interactive shell offers it — including VS Code Remote-SSH terminals, which are non-login and never read `~/.profile`. The installer also strips any older dtach block left in `~/.profile` so a plain SSH login doesn't prompt twice.
 9. On Linux, installs `etc/profile.d/disk-usage-warning.sh` to `/etc/profile.d/` (needs `sudo`) so each login warns when `/` or `/home` cross 85% usage.
-10. On Linux, installs **code-server** (VS Code in the browser) via its vendor script — skipped if already present — and enables the `code-server@$USER` systemd service.
-11. On Linux, sets up **RDP remote login** via `gnome-remote-desktop` (Wayland-native): installs the daemon + `openssl`, generates a self-signed TLS cert once, and prompts interactively for shared "gate" credentials (skipped when no terminal is attached, or already set). Disables `xrdp` if present; opens UFW port `3389` only when UFW is already active.
+10. On Linux, installs **code-server** (VS Code in the browser) via its vendor script — skipped if already present — and enables the `code-server@<login>` systemd service (login from `id -un`: the bashrc overrides `$USER`).
+11. On Linux, installs **`ubuntu-desktop-minimal`** (GDM + GNOME Shell, ~1.5 GB): the RDP remote login below hands out a GNOME session, which a bare server install does not have. Then sets up **RDP remote login** via `gnome-remote-desktop` (Wayland-native): installs the daemon + `openssl`, generates a self-signed TLS cert once, and prompts interactively for shared "gate" credentials (skipped when no terminal is attached, or already set). Disables `xrdp` if present; opens UFW port `3389` only when UFW is already active. Finally, when `lspci` sees an NVIDIA GPU, runs `ubuntu-drivers install` to put on the driver the distro recommends for the card (no version pinned; loads at the next reboot). Skipped on machines without an NVIDIA GPU.
 12. On Linux, installs the **`cloudpex`** NAS mount helper to `/usr/local/bin` via `cloudpex/install.sh`, which prompts for the NAS host, share name, SMB user, mount point and SMB version and writes them to `/etc/cloudpex.conf` (root, `0600`; an existing config is shown and kept unless you say `n`; skipped when no terminal is attached). Nothing is mounted, no password stored, see [`cloudpex/README.md`](cloudpex/README.md).
 13. On Linux, installs the **security baseline**, always, no prompt: **fail2ban** (+ `nftables`) with `etc/fail2ban/jail.d/local.conf` (sshd jail reading the journal, bans the offending IP on every port so the SSH port does not matter, 5 failures in 10 min → 1 h ban, loopback and private LAN ranges never banned); **unattended-upgrades** enabled through `etc/apt/apt.conf.d/20auto-upgrades`; and the **sshd drop-in** `etc/ssh/sshd_config.d/20-hardening.conf` (`PermitRootLogin no`, `MaxAuthTries 3`, `LoginGraceTime 20`), checked with `sshd -t` and removed again if sshd rejects it, then `reload ssh`. Authentication methods, port and user lists are left as they are.
 14. On Linux, at the very end, **offers** (`[y/N]`, skipped when no terminal is attached) to move **`/tmp` to disk**: Ubuntu mounts `/tmp` as a RAM-backed tmpfs capped at 50% of RAM, which agent runs fill, halving the RAM and breaking every shell with "No space left on device". Accepting masks `tmp.mount` and installs `etc/tmpfiles.d/tmp.conf` (wipe at boot, 10-day purge). Effective at the next reboot.
@@ -75,12 +78,14 @@ What it does:
 
 ### Packages installed (apt)
 
-- **Build / VCS / C dev**: `vim git git-lfs git-filter-repo gcc make pkg-config dkms valgrind shellcheck`
+- **Build / VCS / C dev**: `vim git git-lfs git-filter-repo gitleaks gcc make pkg-config dkms valgrind shellcheck gh git-delta` (`git-delta` = `delta`, the pager set in `gitconfig`)
 - **Net / security / transport**: `curl gnupg ca-certificates apt-transport-https net-tools openssh-server cifs-utils lftp ftp`
 - **Shell tooling**: `unzip tree tmux fzf dtach`
 - **Runtimes**: `nodejs python3-pip pipx php-cli`
+- **Web stack (local WordPress/LAMP)**: `mariadb-server imagemagick php-mysql php-gd php-imagick php-mbstring php-xml php-intl php-curl` (unversioned `php-*` metapackages, so they follow the distro's PHP)
 - **Media / doc CLI**: `ffmpeg weasyprint poppler-utils qpdf webp libavif-bin`
 - **Docker**: `docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin` (via Docker's repo)
+- **Desktop / GPU**: `ubuntu-desktop-minimal` (always, Linux) + the distro-recommended NVIDIA driver via `ubuntu-drivers install` (only when an NVIDIA GPU is detected)
 - **Remote access**: `gnome-remote-desktop openssl` (apt) + `code-server` (via its vendor install script, not apt) — RDP remote login + browser VS Code
 - **pipx**: `PyMuPDF` (`pymupdf`), `Markdown` (`markdown_py`)
 - **Security baseline (Linux, always)**: `fail2ban nftables unattended-upgrades`
@@ -88,7 +93,20 @@ What it does:
 
 The script is re-runnable: each run re-backs up to `~/Oldconfig` (overwriting the previous backup), re-clones plugins, skips Docker if already installed, and re-deploys the `bin/` scripts.
 
-> Notes: the package list is Debian/Ubuntu-specific, and the Docker repo step assumes **Ubuntu**. On macOS the whole `apt-get` block is skipped — install `vim`/`git`/toolchain via Homebrew yourself.
+> Note: the Docker repo step assumes **Ubuntu**.
+
+### macOS
+
+The same `./install.sh` detects macOS and replaces `apt-get` with Homebrew. It first asks which login shell you want, **bash** or **zsh** (`[bash]` by default; answer in advance with `MACOS_SHELL=zsh ./install.sh`, and with no terminal attached it picks bash):
+
+1. Installs Homebrew with its official script when `brew` is missing (this also pulls the Xcode Command Line Tools: clang, make, git), then `brew update` + `brew upgrade`.
+2. Installs the apt list mapped to formulae: `vim git git-lfs git-filter-repo gitleaks pkgconf shellcheck gh git-delta curl gnupg lftp inetutils unzip tree tmux fzf dtach node python pipx php mariadb imagemagick ffmpeg weasyprint poppler qpdf webp libavif bash`. Brew's `php` already ships gd, mbstring, xml, intl, curl and mysql.
+3. Docker: `colima` (the Linux VM) + `docker docker-compose docker-buildx`. Writes `~/.docker/config.json` with `cliPluginsExtraDirs` so `docker compose` works, only when that file does not exist yet (otherwise prints the line to add).
+4. Starts `colima`, `code-server` and `mariadb` as `brew services` (the `systemctl enable --now` equivalent), skipping any already started.
+5. Deploys `bashrc-osx`, then appends one line to `~/.bash_profile` that sources `~/.bashrc`: macOS terminals open login shells, which never read `~/.bashrc` on their own. Done for both choices, so `bash` stays usable.
+6. **bash** chosen: makes brew's bash 5 the login shell (adds it to `/etc/shells` with `sudo`, then `chsh`, which asks for your password). macOS ships bash 3.2, too old for the bashrc.
+   **zsh** chosen: installs oh-my-zsh with its official script (unattended, skipped if `~/.oh-my-zsh` exists), deploys `zsh/zshrc-osx` to `~/.zshrc` and the `bchanot` theme to `~/.oh-my-zsh/custom/themes/`, then makes `/bin/zsh` the login shell. An existing `~/.zshrc` that differs from the repo's is saved as `~/.zshrc.backup-<date>` (outside `~/Oldconfig`, which every run wipes). Move your machine-specific lines (nvm, bun, tokens) into `~/.zshrc.local`: the deployed zshrc loads it.
+7. Ends with the list of what the Linux install has and this one does not: `gcc` (Apple clang answers to `gcc`), `valgrind`, `dkms`, `net-tools`, `openssh-server` and the RDP desktop (both built into macOS, switched on in System Settings > Sharing), `cifs-utils`, `php-imagick`, the NVIDIA driver, the disk-usage warning, `cloudpex`, the security baseline and the two end-of-install offers.
 
 ### CLI scripts (`bin/`)
 
@@ -105,8 +123,8 @@ Deployed to `~/.local/bin` (the deployed bashrc adds this dir to `PATH`):
 ## Requirements
 
 - `bash`, `git`
-- Debian/Ubuntu `apt-get` for the package step (optional elsewhere)
-- A `bash` login shell (zsh users: switch to bash for these prompts to apply)
+- Debian/Ubuntu `apt-get`, or macOS (Homebrew is installed if missing)
+- A `bash` login shell on Linux (zsh users switch to bash for these prompts to apply). On macOS the installer sets bash or zsh, your choice
 
 ## License
 

bash/bashrc-linux

@@ -25,9 +25,9 @@ fi
 #export LANG=en_US.UTF-8
 
 
-# Used for vim header
-export VIUSER=bchanot
-export VIMAIL=bchanot@gmail.fr
+# Identity for the vim header; install.sh also writes it into ~/.gitconfig
+export USER=bchanot
+export EMAIL=bchanot@gmail.fr
 
 ## Activate and custom bash completion
 #bind 'TAB:menu-complete'

bash/bashrc-osx

@@ -1,19 +1,18 @@
+# Homebrew on PATH (Apple Silicon: /opt/homebrew, Intel: /usr/local).
+# Must come first: brew's bash, vim, git, fzf and dtach shadow the system ones.
+for brew_bin in /opt/homebrew/bin/brew /usr/local/bin/brew; do
+	if [ -x "$brew_bin" ]; then
+		eval "$("$brew_bin" shellenv)"
+		break
+	fi
+done
+unset brew_bin
+
 ## Enable color support of ls and also add handy aliases
-# Some colors
+# Some colors (BSD ls: -G instead of GNU --color)
 alias ls='ls -G'
 alias grep='grep --color=auto'
 
-# Some utils aliases
-alias ll='ls -l'
-alias la='ls -A'
-alias rmrf='rm -rf'
-alias gcl='git clone'
-alias vim='vim -p'
-
-# Aliases for executing ~/.script scripts
-alias gitan='sh ~/.script/gitan.sh'
-alias clean='sh ~/.script/clean.sh'
-
 ## Some export
 # colored GCC warnings and errors
 export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
@@ -24,9 +23,21 @@ case ":$PATH:" in
 	*) export PATH="$HOME/.local/bin:$PATH" ;;
 esac
 
-# Used for vim header
-export VIUSER=xuser
-export VIMAIL=xuser@student.42.fr
+# Set history size to unlimited
+if [[ $EUID == 0 ]] ; then
+	export HISTSIZE=0
+	export HISTFILESIZE=0
+else
+	export HISTSIZE=-1
+	export HISTFILESIZE=-1
+fi
+
+#export LANG=en_US.UTF-8
+
+
+# Identity for the vim header; install.sh also writes it into ~/.gitconfig
+export USER=bchanot
+export EMAIL=bchanot@gmail.fr
 
 ## Activate and custom bash completion
 #bind 'TAB:menu-complete'
@@ -44,7 +55,38 @@ function parse_git_branch() {
 			echo ""
 	fi
 }
+# BSD date has no %N: use bash 5's microsecond clock, scaled to nanoseconds.
+# Falls back to whole seconds under the system bash 3.2.
+function timer_now {
+    if [ -n "${EPOCHREALTIME:-}" ]; then
+        echo "${EPOCHREALTIME/[.,]/}000"
+    else
+        echo "$(date +%s)000000000"
+    fi
+}
 
+function timer_start {
+    timer_start=${timer_start:-$(timer_now)}
+}
+
+function timer_stop {
+    local delta_us=$((($(timer_now) - $timer_start) / 1000))
+    local us=$((delta_us % 1000))
+    local ms=$(((delta_us / 1000) % 1000))
+    local s=$(((delta_us / 1000000) % 60))
+    local m=$(((delta_us / 60000000) % 60))
+    local h=$((delta_us / 3600000000))
+    # Goal: always show around 3 digits of accuracy
+    if ((h > 0)); then timer_show=${h}h${m}m
+    elif ((m > 0)); then timer_show=${m}m${s}s
+    elif ((s >= 10)); then timer_show=${s}.$((ms / 100))s
+    elif ((s > 0)); then timer_show=${s}.$(printf %03d $ms)s
+    elif ((ms >= 100)); then timer_show=${ms}ms
+    elif ((ms > 0)); then timer_show=${ms}.$((us / 100))ms
+    else timer_show=${us}us
+    fi
+    unset timer_start
+}
 # get current status of git repo
 function parse_git_dirty {
 	status=`git status 2>&1 | tee`
@@ -72,6 +114,35 @@ function parse_git_dirty {
 	fi
 }
 
-export PS1='`if [ $? = 0 ]; then echo "\[\033[01;36m\]✔"; else echo "\[\033[01;31m\]✘"; fi` \[\033[32m\]\w\[\033[34m\]$(parse_git_branch " %s") \[\033[0m\]>\[\033[00m\] '
+function set_prompt {
+	timer_stop
 
+	if [[ $EUID == 0 ]] ; then
+		export PS1='`if [ $? = 0 ]; then echo "\[\033[01;36m\]✔"; else echo "\[\033[01;31m\]✘"; fi` ($timer_show) \[\033[01;31m\]\u [\[\033[00;0m\] \w \[\033[01;31m\]]\[\033[01;34m\]$(parse_git_branch " %s") \[\033[00;00m\]> '
+	else
+		export PS1='`if [ $? = 0 ]; then echo "\[\033[01;36m\]✔"; else echo "\[\033[01;31m\]✘"; fi` ($timer_show) \[\033[01;32m\]\u [\[\033[00;0m\] \w \[\033[01;32m\]]\[\033[01;34m\]$(parse_git_branch " %s") \[\033[00;00m\]> '
+	fi
+}
+
+trap 'timer_start' DEBUG
+PROMPT_COMMAND='set_prompt'
 ## Lancement des commandes au demarrages
+
+# claude-dans-dtach : creer une session (claude tournant dans dtach, detache via Ctrl-\).
+# Usage : cd ~/projets/seo && cc seo   -> session nommee "seo".
+# Pas de systemd sur macOS : dtach est lance directement (pas de slice cgroup).
+dtach_claude() {
+  local name="${1:-claude-$(date +%H%M%S)}"
+  mkdir -p "$HOME/.dtach"
+  dtach -c "$HOME/.dtach/${name}" -e '^\' \
+      bash -c 'set -a; [ -f "$HOME/.claude/.env" ] && . "$HOME/.claude/.env"; set +a; exec claude'
+}
+alias cc='dtach_claude'
+
+# Rappeler a la demande le menu de reprise.
+alias d='source ~/.local/bin/dtach-router'
+
+# Au demarrage d'un shell interactif, proposer de reprendre une session dtach existante
+# (silencieux si aucune). Place ici plutot que dans ~/.profile car les terminaux VS Code
+# Remote-SSH sont non-login et ne lisent pas ~/.profile ; ~/.bashrc, lui, est toujours lu.
+case $- in *i*) [ -x "$HOME/.local/bin/dtach-router" ] && . "$HOME/.local/bin/dtach-router" ;; esac

bin/dt

@@ -28,12 +28,22 @@ _pids_for_socket() {
   pgrep -f -- "dtach -[cnAN] $sock" 2>/dev/null | sort -u
 }
 
-_cwd_of() { readlink -f "/proc/$1/cwd" 2>/dev/null; }
+# Dossier courant du process : /proc sur Linux, lsof sur macOS (pas de /proc).
+_cwd_of() {
+  if [ -d /proc ]; then
+    readlink -f "/proc/$1/cwd" 2>/dev/null
+  else
+    lsof -a -p "$1" -d cwd -Fn 2>/dev/null | sed -n 's/^n//p'
+  fi
+}
 
 # Heure de demarrage REELLE du process (fiable, immuable), en epoch.
+# date -d = GNU (Linux), date -j -f = BSD (macOS). Locale C : format lstart stable.
 _starttime_of() {
-  local ls; ls=$(ps -o lstart= -p "$1" 2>/dev/null) || return
-  [ -n "$ls" ] && date -d "$ls" +%s 2>/dev/null
+  local ls; ls=$(LC_ALL=C ps -o lstart= -p "$1" 2>/dev/null) || return
+  [ -n "$ls" ] || return
+  LC_ALL=C date -d "$ls" +%s 2>/dev/null \
+    || LC_ALL=C date -j -f '%a %b %e %T %Y' "$ls" +%s 2>/dev/null
 }
 
 _age() {
@@ -52,6 +62,8 @@ _age() {
 emit_raw() {
   shopt -s nullglob
   local sock name pids master cwd start
+  # Tilde via variable : "\~" en remplacement reste "\~" sous bash 3.2 (macOS).
+  local tilde='~'
   for sock in "$DTDIR"/*; do
     [ -S "$sock" ] || continue
     name=$(basename "$sock")
@@ -61,7 +73,7 @@ emit_raw() {
     cwd=$(_cwd_of "$master");        cwd="${cwd:-?}"
     start=$(_starttime_of "$master"); start="${start:-$now}"
     # colonnes : NOM(cache pour fzf) TAB DOSSIER TAB AGE
-    printf '%s\t%s\t%s\n' "$name" "${cwd/#$HOME/\~}" "$(_age "$start")"
+    printf '%s\t%s\t%s\n' "$name" "${cwd/#$HOME/$tilde}" "$(_age "$start")"
   done
 }
 
@@ -99,6 +111,6 @@ case "${1:-}" in
   kill)  shift; cmd_kill "$@" ;;
   sock)  shift; cmd_sock "$@" ;;
   --raw) emit_raw ;;
-  ""|-h|--help) sed -n '2,18p' "$0" | sed 's/^# \?//' ;;
-  *) echo "Commande inconnue: $1"; sed -n '2,18p' "$0" | sed 's/^# \?//'; exit 1 ;;
+  ""|-h|--help) sed -n '2,18p' "$0" | sed -E 's/^# ?//' ;;
+  *) echo "Commande inconnue: $1"; sed -n '2,18p' "$0" | sed -E 's/^# ?//'; exit 1 ;;
 esac

gitconfig

@@ -0,0 +1,31 @@
+# Template for the user-scope ~/.gitconfig, rendered by install.sh.
+# Git never expands $VARS: @USER@ and @EMAIL@ are replaced at install
+# time with the USER and EMAIL exported by the deployed bashrc.
+# A repo .git/config still overrides these values for that repo.
+[user]
+    name = @USER@
+    email = @EMAIL@
+[push]
+    default = current
+[color]
+    ui = auto
+[pull]
+    rebase = true
+[core]
+    editor = vim
+    pager = delta
+    excludesfile = ~/.gitignore
+[advice]
+    detachedHead = false
+[merge]
+    tool = vimdiff
+    conflictStyle = zdiff3
+[pager]
+    branch = false
+[url "git@salsa.debian.org:installer-team/"]
+    pushInsteadOf = https://salsa.debian.org/installer-team/
+[interactive]
+    diffFilter = delta --color-only
+[delta]
+    navigate = true  # use n and N to move between diff sections
+    dark = true      # or light = true, or omit for auto-detection

install.sh

@@ -27,6 +27,25 @@ install_docker() {
 	sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
 }
 
+# NVIDIA driver: only when an NVIDIA GPU is on the PCI bus (vendor id 10de), so the
+# script stays hardware-agnostic elsewhere. ubuntu-drivers picks the driver the distro
+# recommends for the card (595-open on the RTX 3060 Ti this was written on) instead of
+# pinning a version that ages. Idempotent: a no-op when the recommended driver is in.
+# The driver loads at the next reboot. Ubuntu-only (ubuntu-drivers-common).
+install_nvidia_driver() {
+	if ! command -v ubuntu-drivers >/dev/null 2>&1; then
+		echo "ubuntu-drivers not found — skipping NVIDIA driver" >&2
+		return 0
+	fi
+	if [ -z "$(lspci -d 10de: 2>/dev/null)" ]; then
+		echo "No NVIDIA GPU detected — skipping NVIDIA driver"
+		return 0
+	fi
+	echo "NVIDIA GPU detected — installing the recommended driver"
+	sudo ubuntu-drivers install
+	echo "NVIDIA driver loads at the next reboot."
+}
+
 # RDP "gate" credentials: a shared username/password that unlocks the GDM
 # login screen (each user then logs into GDM with his own account). Required —
 # without it the RDP server rejects every connection (mstsc error 0x904). It is
@@ -254,19 +273,254 @@ offer_ssh_memory_guard() {
 	fi
 }
 
-# System packages: Debian/Ubuntu only. Skipped where apt-get is absent (e.g. macOS).
+# Put brew on this script's PATH (Apple Silicon: /opt/homebrew, Intel: /usr/local).
+# Returns 1 when Homebrew is not installed.
+load_brew_env() {
+	local brew_bin
+	for brew_bin in /opt/homebrew/bin/brew /usr/local/bin/brew; do
+		if [ -x "$brew_bin" ]; then
+			eval "$("$brew_bin" shellenv)"
+			return 0
+		fi
+	done
+	return 1
+}
+
+# Homebrew is the macOS stand-in for apt-get. Installed with its official script
+# (asks for the sudo password, pulls the Xcode Command Line Tools: clang, make, git).
+# Idempotent: a no-op when brew is already there.
+ensure_homebrew() {
+	load_brew_env && return 0
+	echo "Installing Homebrew"
+	/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+	load_brew_env
+}
+
+# The apt-get package list, mapped to Homebrew formulae. Linux-only packages are
+# left out and listed by print_macos_gaps. php ships gd, mbstring, xml, intl, curl
+# and mysql built in; bash is the bash 5 the bashrc needs (macOS ships 3.2).
+install_brew_packages() {
+	brew update
+	brew upgrade
+	brew install \
+		vim git git-lfs git-filter-repo gitleaks pkgconf shellcheck gh git-delta \
+		curl gnupg lftp inetutils \
+		unzip tree tmux fzf dtach \
+		node python pipx php \
+		mariadb imagemagick \
+		ffmpeg weasyprint poppler qpdf webp libavif \
+		bash
+}
+
+# Start a Homebrew service at login, like systemctl enable --now. Skipped when
+# already started, so a re-run never restarts a running database or VM.
+start_brew_service() {
+	local status
+	status="$(brew services list | awk -v name="$1" '$1 == name { print $2 }')"
+	if [ "$status" = "started" ]; then
+		echo "$1 service already started — skipping"
+		return 0
+	fi
+	brew services start "$1"
+}
+
+# Docker on macOS: the docker CLI talks to a Linux VM run by colima (free, no GUI,
+# no Docker Desktop licence). compose and buildx are CLI plugins that brew installs
+# outside Docker's search path, hence cliPluginsExtraDirs. An existing
+# ~/.docker/config.json is never rewritten: a hint is printed instead.
+install_colima_docker() {
+	local config="$HOME/.docker/config.json"
+	local plugins
+	plugins="$(brew --prefix)/lib/docker/cli-plugins"
+	brew install colima docker docker-compose docker-buildx
+	if [ ! -f "$config" ]; then
+		mkdir -p "$HOME/.docker"
+		printf '{\n  "cliPluginsExtraDirs": ["%s"]\n}\n' "$plugins" > "$config"
+	elif ! grep -qF "$plugins" "$config"; then
+		echo "Add \"cliPluginsExtraDirs\": [\"$plugins\"] to $config for 'docker compose'" >&2
+	fi
+	start_brew_service colima
+}
+
+# macOS login shell: bash (brew's bash 5 + bashrc-osx) or zsh (oh-my-zsh +
+# zshrc-osx). MACOS_SHELL=bash|zsh answers in advance; with no terminal attached
+# and no answer, bash. Prints the choice on stdout (the question goes to stderr).
+choose_macos_shell() {
+	local answer="${MACOS_SHELL:-}"
+	if [ -z "$answer" ] && [ -t 0 ]; then
+		read -rp "Login shell on macOS: bash or zsh (oh-my-zsh)? [bash] " answer || true
+	fi
+	case "$answer" in
+		zsh) echo zsh ;;
+		bash|"") echo bash ;;
+		*) echo "Unknown shell '$answer' — using bash" >&2; echo bash ;;
+	esac
+}
+
+# Make $1 the login shell. /etc/shells must list it before chsh accepts it.
+# chsh asks for the account password; a failure only prints a hint. Idempotent.
+set_login_shell() {
+	local target="$1" current
+	if ! grep -qxF "$target" /etc/shells; then
+		echo "$target" | sudo tee -a /etc/shells >/dev/null
+	fi
+	# id -un, not $USER: the deployed rc sets USER to the git/vim identity.
+	current="$(dscl . -read "/Users/$(id -un)" UserShell | awk '{ print $2 }')"
+	if [ "$current" = "$target" ]; then
+		echo "Login shell already $target — skipping"
+		return 0
+	fi
+	chsh -s "$target" || echo "chsh failed — run: chsh -s $target" >&2
+}
+
+# oh-my-zsh with its official script, unattended: no chsh (set_login_shell does
+# it), no zsh launched mid-install, ~/.zshrc left alone (deploy_zsh_config owns
+# it). Idempotent: skipped when ~/.oh-my-zsh exists.
+install_oh_my_zsh() {
+	if [ -d "$HOME/.oh-my-zsh" ]; then
+		echo "oh-my-zsh already installed — skipping"
+		return 0
+	fi
+	echo "Installing oh-my-zsh"
+	KEEP_ZSHRC=yes sh -c \
+		"$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" \
+		"" --unattended
+}
+
+# Deploy zshrc-osx to ~/.zshrc and the bchanot prompt theme into oh-my-zsh's
+# custom themes. A ~/.zshrc that differs from the repo's is kept as
+# ~/.zshrc.backup-<date>, not in ~/Oldconfig: that dir is wiped on every run, so
+# a second run would destroy the original (and its nvm/bun lines).
+deploy_zsh_config() {
+	local themes="$HOME/.oh-my-zsh/custom/themes"
+	local backup
+	backup="$HOME/.zshrc.backup-$(date +%Y%m%d-%H%M%S)"
+	if [ -e "$HOME/.zshrc" ] && ! cmp -s "$HOME/.zshrc" "$SCRIPT_DIR/zsh/zshrc-osx"; then
+		echo "Saving the current ~/.zshrc to $backup"
+		mv "$HOME/.zshrc" "$backup"
+	fi
+	echo "Deploying zsh/zshrc-osx + bchanot theme"
+	cp "$SCRIPT_DIR/zsh/zshrc-osx" "$HOME/.zshrc"
+	mkdir -p "$themes"
+	cp "$SCRIPT_DIR/zsh/bchanot.zsh-theme" "$themes/"
+}
+
+# The chosen macOS shell: zsh gets oh-my-zsh + its config; bash needs brew's
+# bash 5 (macOS ships 3.2, too old for the bashrc). Either way it becomes the
+# login shell, so new terminals load the matching config.
+setup_macos_shell() {
+	if [ "$1" = zsh ]; then
+		install_oh_my_zsh
+		deploy_zsh_config
+		set_login_shell /bin/zsh
+	else
+		set_login_shell "$(brew --prefix)/bin/bash"
+	fi
+}
+
+# macOS terminals open LOGIN shells, which read ~/.bash_profile and never ~/.bashrc.
+# Appends one line sourcing ~/.bashrc. Idempotent: skipped when already present.
+wire_bash_profile() {
+	local profile="$HOME/.bash_profile"
+	# shellcheck disable=SC2016  # $HOME must expand when the profile runs, not now.
+	local line='[ -f "$HOME/.bashrc" ] && . "$HOME/.bashrc"'
+	grep -qxF "$line" "$profile" 2>/dev/null && return 0
+	echo "Wiring ~/.bash_profile to source ~/.bashrc"
+	printf '\n# Load the interactive bash config (deployed by install.sh).\n%s\n' \
+		"$line" >> "$profile"
+}
+
+# Value of `export NAME=value` ($1) in the rc file $2, quotes stripped. The last
+# match wins, as when the shell sources it. Empty when absent.
+rc_export_value() {
+	sed -n "s/^export $1=//p" "$2" | tail -n 1 | tr -d "\"'"
+}
+
+# Print the repo gitconfig template with @USER@ and @EMAIL@ replaced by $1 and
+# $2. Bash substitution, so the values need no sed escaping.
+render_gitconfig() {
+	local name="$1" email="$2" line
+	while IFS= read -r line || [ -n "$line" ]; do
+		line="${line//@USER@/$name}"
+		line="${line//@EMAIL@/$email}"
+		printf '%s\n' "$line"
+	done < "$SCRIPT_DIR/gitconfig"
+}
+
+# Install the user-scope ~/.gitconfig (a repo's own .git/config still wins).
+# The identity is read from the USER/EMAIL exports of the deployed rc ($1), so
+# git and the shell agree. A ~/.gitconfig that differs is kept as
+# ~/.gitconfig.backup-<date>, outside ~/Oldconfig which every run wipes.
+# Idempotent: an identical ~/.gitconfig is left alone.
+deploy_gitconfig() {
+	local rc="$1" name email rendered backup
+	name="$(rc_export_value USER "$rc")"
+	email="$(rc_export_value EMAIL "$rc")"
+	if [ -z "$name" ] || [ -z "$email" ]; then
+		echo "USER/EMAIL not exported by $rc — skipping ~/.gitconfig" >&2
+		return 0
+	fi
+	rendered="$(render_gitconfig "$name" "$email")"
+	if printf '%s\n' "$rendered" | cmp -s - "$HOME/.gitconfig"; then
+		echo "$HOME/.gitconfig already up to date — skipping"
+		return 0
+	fi
+	if [ -e "$HOME/.gitconfig" ]; then
+		backup="$HOME/.gitconfig.backup-$(date +%Y%m%d-%H%M%S)"
+		echo "Saving the current ~/.gitconfig to $backup"
+		mv "$HOME/.gitconfig" "$backup"
+	fi
+	echo "Deploying gitconfig to ~/.gitconfig ($name <$email>)"
+	printf '%s\n' "$rendered" > "$HOME/.gitconfig"
+}
+
+# What the Linux install sets up that this macOS run did not, and why.
+print_macos_gaps() {
+	cat <<'EOF'
+
+Not installed on macOS (compared with the Linux install):
+  - gcc, make          Apple clang + make come with the Xcode Command Line Tools
+                       (`gcc` runs clang). Real GCC: brew install gcc (gcc-15).
+  - valgrind           not supported on macOS arm64. Use `leaks` or -fsanitize=address.
+  - dkms               Linux kernel modules, no macOS equivalent.
+  - net-tools          ifconfig / netstat / route are built into macOS.
+  - openssh-server     built in, off by default: System Settings > General >
+                       Sharing > Remote Login.
+  - cifs-utils         SMB mounts are built in: mount_smbfs, or Finder Cmd-K.
+  - ca-certificates, apt-transport-https   apt plumbing, not needed.
+  - php-imagick        not bundled with brew php: pecl install imagick.
+  - ubuntu-desktop-minimal + RDP (gnome-remote-desktop)   use Screen Sharing:
+                       System Settings > General > Sharing > Screen Sharing.
+  - NVIDIA driver      no NVIDIA GPU support on macOS.
+  - disk-usage login warning (/etc/profile.d)   Linux-only (GNU df).
+  - cloudpex NAS mount helper   Linux-only (cifs-utils).
+  - fail2ban, unattended-upgrades, sshd hardening drop-in   Linux security baseline.
+                       macOS: enable automatic updates in System Settings >
+                       General > Software Update.
+  - /tmp on disk + SSH memory guard offers   systemd-only.
+Replaced: Docker engine -> colima VM + docker CLI; code-server and mariadb run
+as brew services instead of systemd units.
+EOF
+}
+
+# System packages: apt-get on Debian/Ubuntu, Homebrew on macOS.
 if command -v apt-get >/dev/null 2>&1; then
 	sudo apt-get update
 	sudo apt-get upgrade -y
 
-	# Build + version control + C dev tooling.
+	# Build + version control + C dev tooling (gitleaks backs the pre-commit hook,
+	# git-delta provides `delta`, the pager set in gitconfig).
+	# Web stack: MariaDB + PHP modules for local WordPress/LAMP work; the php-* metapackages
+	# follow the distro's PHP version instead of pinning php8.x-*.
 	sudo apt-get install -y \
-		vim git git-lfs git-filter-repo gcc make pkg-config dkms valgrind shellcheck \
+		vim git git-lfs git-filter-repo gitleaks gcc make pkg-config dkms valgrind shellcheck git-delta \
 		curl gnupg ca-certificates apt-transport-https \
 		unzip tree tmux fzf dtach net-tools \
 		openssh-server cifs-utils lftp ftp \
 		nodejs python3-pip pipx php-cli \
-		ffmpeg weasyprint poppler-utils qpdf webp libavif-bin gh
+		ffmpeg weasyprint poppler-utils qpdf webp libavif-bin gh \
+		mariadb-server imagemagick \
+		php-mysql php-gd php-imagick php-mbstring php-xml php-intl php-curl
 
 	# Docker (separate repo).
 	install_docker
@@ -275,11 +529,19 @@ if command -v apt-get >/dev/null 2>&1; then
 	if ! command -v code-server >/dev/null 2>&1; then
 		curl -fsSL https://code-server.dev/install.sh | sh
 	fi
-	sudo systemctl enable --now "code-server@$USER"
+	# id -un, not $USER: the deployed bashrc sets USER to the git/vim identity.
+	sudo systemctl enable --now "code-server@$(id -un)"
+
+	# GNOME desktop (GDM + Shell): the RDP remote login below needs a GNOME session
+	# to hand out; a bare server install has none. Ubuntu-only metapackage.
+	sudo apt-get install -y ubuntu-desktop-minimal
 
 	# Remote desktop (gnome-remote-desktop — see the function header for why not xrdp).
 	setup_remote_desktop
 
+	# NVIDIA driver, only when an NVIDIA GPU is present.
+	install_nvidia_driver
+
 	# Low-disk login warning (system-wide profile.d snippet).
 	install_disk_warning
 
@@ -290,8 +552,21 @@ if command -v apt-get >/dev/null 2>&1; then
 	install_fail2ban
 	install_unattended_upgrades
 	harden_sshd
+elif [ "$(uname -s)" = "Darwin" ]; then
+	# Asked first, so the long brew steps below can run unattended.
+	macos_shell="$(choose_macos_shell)"
+	echo "macOS login shell: $macos_shell"
+
+	ensure_homebrew
+	install_brew_packages
+
+	# Docker (colima VM), then code-server and MariaDB as login services.
+	install_colima_docker
+	brew install code-server
+	start_brew_service code-server
+	start_brew_service mariadb
 else
-	echo "apt-get not found — skipping system packages (install vim/git manually)."
+	echo "Neither apt-get nor macOS — skipping system packages (install vim/git manually)."
 fi
 
 # Back up any existing config before overwriting (re-runnable).
@@ -317,7 +592,7 @@ git clone --quiet https://github.com/preservim/nerdtree "$HOME/.vim/bundle/nerdt
 
 # Deploy tracked vim files: vimrc, pathogen loader, molokai colorscheme.
 echo "Deploying vim config"
-cp -rupv "$SCRIPT_DIR"/vim/* "$HOME/.vim/"
+cp -Rpv "$SCRIPT_DIR"/vim/* "$HOME/.vim/"
 ln -sf "$HOME/.vim/vimrc" "$HOME/.vimrc"
 
 # Deploy the bashrc matching the detected OS.
@@ -330,6 +605,9 @@ fi
 echo "Deploying $bashrc"
 cp "$SCRIPT_DIR/$bashrc" "$HOME/.bashrc"
 
+# User-scope git config, identity taken from the bashrc just deployed.
+deploy_gitconfig "$SCRIPT_DIR/$bashrc"
+
 # Python CLIs via pipx (run as the user, never sudo). Skipped if pipx is absent.
 if command -v pipx >/dev/null 2>&1; then
 	echo "Installing pipx CLIs (PyMuPDF -> pymupdf, Markdown -> markdown_py)"
@@ -355,6 +633,20 @@ if command -v apt-get >/dev/null 2>&1; then
 	offer_ssh_memory_guard
 fi
 
-echo "Done. Restart your shell or run: source ~/.bashrc"
-echo "If you use zsh, switch to bash to enjoy these settings =)"
-echo "Note: the deployed bashrc puts ~/.local/bin on PATH — re-login or run: source ~/.bashrc"
+# macOS: login shells skip ~/.bashrc unless ~/.bash_profile sources it (kept even
+# with zsh, so `bash` stays usable); set up the chosen shell, then report what the
+# Linux install has that this one does not.
+if [ "$(uname -s)" = "Darwin" ]; then
+	wire_bash_profile
+	setup_macos_shell "${macos_shell:-bash}"
+	print_macos_gaps
+fi
+
+if [ "${macos_shell:-bash}" = zsh ]; then
+	echo "Done. Open a new terminal or run: exec zsh"
+	echo "Machine-specific zsh lines (nvm, bun...) go in ~/.zshrc.local"
+else
+	echo "Done. Restart your shell or run: source ~/.bashrc"
+	echo "If you use zsh, switch to bash to enjoy these settings =)"
+	echo "Note: the deployed bashrc puts ~/.local/bin on PATH — re-login or run: source ~/.bashrc"
+fi

version.txt

@@ -0,0 +1 @@
+1.0.0

zsh/bchanot.zsh-theme

@@ -0,0 +1,57 @@
+# bchanot.zsh-theme — oh-my-zsh port of the bashrc prompt:
+#   ✔ (12ms) user [ ~/dir ] [branch -*+] >
+# Mark + timer cyan (red ✘ on failure), user and brackets green (red for root),
+# git segment blue. Deployed to ~/.oh-my-zsh/custom/themes by install.sh.
+
+zmodload zsh/datetime
+autoload -Uz add-zsh-hook
+
+# Git segment, same rules as parse_git_branch/parse_git_dirty in the bashrc:
+# " [branch bits]" with + (new, modified, renamed or untracked files),
+# * (ahead of upstream) and - (deleted files). Empty outside a repo.
+bchanot_git_info() {
+	local lines branch bits=''
+	lines="$(git status --porcelain --branch 2>/dev/null)" || return 0
+	branch="$(git symbolic-ref --short HEAD 2>/dev/null)" || branch='(detached)'
+	if print -r -- "$lines" | grep -qE '^(\?\?|[MAR].|.M)'; then
+		bits='+'
+	fi
+	if print -r -- "${lines%%$'\n'*}" | grep -q '\[ahead '; then
+		bits="*$bits"
+	fi
+	if print -r -- "$lines" | grep -qE '^(D.|.D)'; then
+		bits="-$bits"
+	fi
+	print -r -- " [${branch}${bits:+ $bits}]"
+}
+
+# Command timer: preexec stamps the start, precmd formats the elapsed time with
+# the bashrc's rules (about 3 significant digits, us up to h).
+bchanot_timer_start() {
+	_bchanot_cmd_start=$EPOCHREALTIME
+}
+
+bchanot_timer_stop() {
+	integer delta_us us ms s m h
+	(( delta_us = (EPOCHREALTIME - ${_bchanot_cmd_start:-$EPOCHREALTIME}) * 1000000 ))
+	(( us = delta_us % 1000, ms = (delta_us / 1000) % 1000 ))
+	(( s = (delta_us / 1000000) % 60, m = (delta_us / 60000000) % 60 ))
+	(( h = delta_us / 3600000000 ))
+	if ((h > 0)); then _bchanot_timer_show=${h}h${m}m
+	elif ((m > 0)); then _bchanot_timer_show=${m}m${s}s
+	elif ((s >= 10)); then _bchanot_timer_show=${s}.$((ms / 100))s
+	elif ((s > 0)); then _bchanot_timer_show=${s}.$(printf %03d $ms)s
+	elif ((ms >= 100)); then _bchanot_timer_show=${ms}ms
+	elif ((ms > 0)); then _bchanot_timer_show=${ms}.$((us / 100))ms
+	else _bchanot_timer_show=${us}us
+	fi
+	unset _bchanot_cmd_start
+}
+
+add-zsh-hook preexec bchanot_timer_start
+add-zsh-hook precmd bchanot_timer_stop
+
+PROMPT='%B%(?.%F{cyan}✔.%F{red}✘) (${_bchanot_timer_show}) '
+PROMPT+='%(!.%F{red}.%F{green})%n [%f%b %~ %B%(!.%F{red}.%F{green})]'
+PROMPT+='%F{blue}$(bchanot_git_info) %f%b> '
+RPROMPT=''

zsh/zshrc-osx

@@ -0,0 +1,67 @@
+# zshrc for macOS: zsh + oh-my-zsh counterpart of bash/bashrc-osx (same env,
+# aliases and dtach menu; the prompt lives in bchanot.zsh-theme).
+# Machine-specific lines (nvm, bun, tokens...) go in ~/.zshrc.local, never here.
+
+# Homebrew on PATH (Apple Silicon: /opt/homebrew, Intel: /usr/local).
+for brew_bin in /opt/homebrew/bin/brew /usr/local/bin/brew; do
+	if [ -x "$brew_bin" ]; then
+		eval "$("$brew_bin" shellenv)"
+		break
+	fi
+done
+unset brew_bin
+
+## oh-my-zsh (loaded first: the aliases below override its defaults, e.g. `d`)
+export ZSH="$HOME/.oh-my-zsh"
+ZSH_THEME="bchanot"
+plugins=(git)
+source "$ZSH/oh-my-zsh.sh"
+
+## Enable color support of ls and also add handy aliases
+# Some colors (BSD ls: -G instead of GNU --color)
+alias ls='ls -G'
+alias grep='grep --color=auto'
+
+## Some export
+# colored GCC warnings and errors
+export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+
+# Ensure ~/.local/bin is on PATH (pipx CLIs + personal scripts from bin/)
+case ":$PATH:" in
+	*":$HOME/.local/bin:"*) ;;
+	*) export PATH="$HOME/.local/bin:$PATH" ;;
+esac
+
+# History: none for root, near-unlimited otherwise (zsh has no -1 = unlimited).
+if [[ $EUID == 0 ]] ; then
+	HISTSIZE=0
+	SAVEHIST=0
+else
+	HISTSIZE=10000000
+	SAVEHIST=10000000
+fi
+
+# Identity for the vim header; install.sh also writes it into ~/.gitconfig
+export USER=bchanot
+export EMAIL=bchanot@gmail.fr
+
+# claude-dans-dtach : creer une session (claude tournant dans dtach, detache via Ctrl-\).
+# Usage : cd ~/projets/seo && cc seo   -> session nommee "seo".
+# Pas de systemd sur macOS : dtach est lance directement (pas de slice cgroup).
+dtach_claude() {
+  local name="${1:-claude-$(date +%H%M%S)}"
+  mkdir -p "$HOME/.dtach"
+  dtach -c "$HOME/.dtach/${name}" -e '^\' \
+      bash -c 'set -a; [ -f "$HOME/.claude/.env" ] && . "$HOME/.claude/.env"; set +a; exec claude'
+}
+alias cc='dtach_claude'
+
+# Rappeler a la demande le menu de reprise.
+alias d='source ~/.local/bin/dtach-router'
+
+# Reglages propres a cette machine (non versionnes).
+[ -f "$HOME/.zshrc.local" ] && source "$HOME/.zshrc.local"
+
+# Au demarrage d'un shell interactif, proposer de reprendre une session dtach existante
+# (silencieux si aucune).
+case $- in *i*) [ -x "$HOME/.local/bin/dtach-router" ] && . "$HOME/.local/bin/dtach-router" ;; esac