feat(install): add git-delta to the apt and brew packages
gitconfig sets core.pager = delta; without the binary git cannot page.
This commit is contained in:
@@ -78,7 +78,7 @@ What it does:
|
|||||||
|
|
||||||
### Packages installed (apt)
|
### Packages installed (apt)
|
||||||
|
|
||||||
- **Build / VCS / C dev**: `vim git git-lfs git-filter-repo gitleaks gcc make pkg-config dkms valgrind shellcheck gh`
|
- **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`
|
- **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`
|
- **Shell tooling**: `unzip tree tmux fzf dtach`
|
||||||
- **Runtimes**: `nodejs python3-pip pipx php-cli`
|
- **Runtimes**: `nodejs python3-pip pipx php-cli`
|
||||||
@@ -100,7 +100,7 @@ The script is re-runnable: each run re-backs up to `~/Oldconfig` (overwriting th
|
|||||||
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):
|
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`.
|
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.
|
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).
|
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.
|
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.
|
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.
|
||||||
|
|||||||
+5
-3
@@ -303,7 +303,7 @@ install_brew_packages() {
|
|||||||
brew update
|
brew update
|
||||||
brew upgrade
|
brew upgrade
|
||||||
brew install \
|
brew install \
|
||||||
vim git git-lfs git-filter-repo gitleaks pkgconf shellcheck gh \
|
vim git git-lfs git-filter-repo gitleaks pkgconf shellcheck gh git-delta \
|
||||||
curl gnupg lftp inetutils \
|
curl gnupg lftp inetutils \
|
||||||
unzip tree tmux fzf dtach \
|
unzip tree tmux fzf dtach \
|
||||||
node python pipx php \
|
node python pipx php \
|
||||||
@@ -508,10 +508,12 @@ if command -v apt-get >/dev/null 2>&1; then
|
|||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get upgrade -y
|
sudo apt-get upgrade -y
|
||||||
|
|
||||||
# Build + version control + C dev tooling (gitleaks backs the pre-commit hook). # Web stack: MariaDB + PHP modules for local WordPress/LAMP work; the php-* metapackages
|
# 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-*.
|
# follow the distro's PHP version instead of pinning php8.x-*.
|
||||||
sudo apt-get install -y \
|
sudo apt-get install -y \
|
||||||
vim git git-lfs git-filter-repo gitleaks 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 \
|
curl gnupg ca-certificates apt-transport-https \
|
||||||
unzip tree tmux fzf dtach net-tools \
|
unzip tree tmux fzf dtach net-tools \
|
||||||
openssh-server cifs-utils lftp ftp \
|
openssh-server cifs-utils lftp ftp \
|
||||||
|
|||||||
Reference in New Issue
Block a user