diff options
| -rw-r--r-- | Brewfile | 3 | ||||
| -rw-r--r-- | config/ghostty/config | 7 | ||||
| -rwxr-xr-x | install.sh | 31 |
3 files changed, 38 insertions, 3 deletions
@@ -5,6 +5,9 @@ # with `brew bundle`, which only adds. # Something breaks without these. +brew "bash" # bin/open and secrets/ use bash 4 syntax (${v,,}); + # macOS ships 3.2, and config/bashrc looks for the + # bash-completion 2.x that needs 4.2 brew "tmux" # both terminals start every window in tmux brew "neovim" # the editor; vi, vim and git all call nvim brew "age" # szecret diff --git a/config/ghostty/config b/config/ghostty/config index 67393b4..0cb6f65 100644 --- a/config/ghostty/config +++ b/config/ghostty/config @@ -30,8 +30,11 @@ font-size = 12 # theme = Monokai Soda # theme = Builtin Light -# Import color scheme (managed by theme script) -config-file = ~/.local/share/ghostty/color +# Import color scheme (managed by theme script). The leading `?` makes it +# optional: bin/theme writes that file, so until it has run on this machine the +# file does not exist, and a plain config-file makes Ghostty refuse to start +# with "error opening config-file ... error.FileNotFound". +config-file = ?~/.local/share/ghostty/color # Shader # custom-shader = ~/.config/ghostty/shader.glsl @@ -28,8 +28,26 @@ if [[ "$(uname)" == "Darwin" ]]; then fi done fi + # Install Homebrew rather than print the command and stop: on a machine whose + # whole setup is this repo there is nothing else to run it, and everything + # below depends on it. NONINTERACTIVE so it does not wait on a RETURN it will + # never see; it still asks for the sudo password, which is why this script is + # run by hand and not on a timer. if ! command -v brew >/dev/null 2>&1; then - >&2 echo "ERROR: Homebrew is not installed. Install it first, then re-run this:" + echo "Homebrew is not installed; installing it now" + NONINTERACTIVE=1 /bin/bash -c \ + "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + for b in /opt/homebrew/bin/brew /usr/local/bin/brew; do + if [[ -x "${b}" ]]; then + eval "$("${b}" shellenv)" + break + fi + done + fi + if ! command -v brew >/dev/null 2>&1; then + >&2 echo "ERROR: Homebrew still not on PATH after installing it. Install it" + >&2 echo "by hand, then re-run this script:" + # shellcheck disable=SC2016 # printed for a human to paste, not expanded >&2 echo ' /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"' exit 1 fi @@ -63,6 +81,17 @@ if command -v nvim >/dev/null 2>&1; then nvim --headless "+Lazy! install" +qa || true fi +# 4. The colours the terminals, tmux, nvim and bat read. bin/theme writes those +# files under $XDG_DATA_HOME; until it has run once they are absent, which +# every config tolerates -- nothing is themed, that is all. Seeded here only +# when this machine has none, with whatever mode and colourscheme `theme` +# reports (its own defaults on a fresh machine), so re-running this script +# never disturbs a machine whose theme is already set. +theme_bin="${dotfiles_dir}/bin/theme" +if [[ ! -e "${XDG_DATA_HOME:-${HOME}/.local/share}/tmux/color.conf" && -x "${theme_bin}" ]]; then + "${theme_bin}" --set "$("${theme_bin}" --mode)" "$("${theme_bin}" --colors)" || true +fi + if [[ "$(uname)" == "Darwin" ]]; then echo echo "Setting up a new Mac? Also run this, once:" |