diff --git a/.claude/tasks/TODO.md b/.claude/tasks/TODO.md index a61c1f3..4d77961 100644 --- a/.claude/tasks/TODO.md +++ b/.claude/tasks/TODO.md @@ -69,3 +69,24 @@ Branch: feature/apt-packages (off develop). Source: apt-mark showmanual + /var/l - [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 , 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 diff --git a/CLAUDE.md b/CLAUDE.md index a1c910a..28aa7ea 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -21,6 +21,7 @@ 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 +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 +38,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 diff --git a/README.md b/README.md index 1561106..d03270d 100644 --- a/README.md +++ b/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. | @@ -28,7 +28,9 @@ curl -fsSL https://git.bchanot.fr/bchanot/config/raw/branch/master/remote-instal | `vim/autoload/` | `pathogen.vim` plugin loader (committed). | | `vim/colors/` | `molokai.vim` colorscheme (committed). | | `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,14 +59,14 @@ 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`. 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, 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. @@ -90,7 +92,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 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-` (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/`) @@ -107,8 +122,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 diff --git a/bash/bashrc-osx b/bash/bashrc-osx index 892362c..3695316 100644 --- a/bash/bashrc-osx +++ b/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 +# 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 + + # Used for vim header -export VIUSER=xuser -export VIMAIL=xuser@student.42.fr +export VIUSER=bchanot +export VIMAIL=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 diff --git a/bin/dt b/bin/dt index bcc30ee..4bb3948 100755 --- a/bin/dt +++ b/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 diff --git a/install.sh b/install.sh index 79aa6c2..b1e486c 100755 --- a/install.sh +++ b/install.sh @@ -273,7 +273,192 @@ 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 \ + 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 + current="$(dscl . -read "/Users/$USER" 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-, 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" +} + +# 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 @@ -320,8 +505,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). @@ -347,7 +545,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. @@ -385,6 +583,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 diff --git a/zsh/bchanot.zsh-theme b/zsh/bchanot.zsh-theme new file mode 100644 index 0000000..d3d9bd3 --- /dev/null +++ b/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='' diff --git a/zsh/zshrc-osx b/zsh/zshrc-osx new file mode 100644 index 0000000..10d2cc9 --- /dev/null +++ b/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 + +# Used for vim header +export VIUSER=bchanot +export VIMAIL=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