From 52a87468a717d7cc4a815717c78dda6502fb53bb Mon Sep 17 00:00:00 2001 From: Joe Lillibridge Date: Wed, 4 Dec 2024 11:44:03 -0600 Subject: [PATCH] wip --- .config/yadm/bootstrap##template | 40 +++++++++++++++---------------- .config/zsh/environment##template | 3 ++- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.config/yadm/bootstrap##template b/.config/yadm/bootstrap##template index b336b8d..5e10a32 100755 --- a/.config/yadm/bootstrap##template +++ b/.config/yadm/bootstrap##template @@ -7,13 +7,13 @@ set -eu {% if yadm.os == "Darwin" %} # install homebrew if it's missing if ! command -v brew >/dev/null 2>&1; then - echo "Installing homebrew" - /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + echo "Installing homebrew" + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" fi if [ -f "$HOME/.Brewfile" ]; then - echo "Updating homebrew bundle" - brew bundle --global + echo "Updating homebrew bundle" + brew bundle --global fi {% endif %} @@ -61,7 +61,7 @@ packages+=( "yadm" "zoxide" "zsh-autosuggestions" - "zsh-syntax-highlighting" + # "zsh-syntax-highlighting" ) {% endif %} @@ -69,20 +69,20 @@ packages+=( BOOTSTRAP_D="${BASH_SOURCE[0]}.d" if [[ ! -d "$BOOTSTRAP_D" ]]; then - echo "Error: bootstrap directory '$BOOTSTRAP_D' not found" >&2 - exit 1 + echo "Error: bootstrap directory '$BOOTSTRAP_D' not found" >&2 + exit 1 fi # This will execute all executable files (excluding templates and editor # backups) in the $BOOTSTRAP_D directory when run. find -L "$BOOTSTRAP_D" -type f | sort | while IFS= read -r bootstrap; do - if [[ -x "$bootstrap" && ! "$bootstrap" =~ "##" && ! "$bootstrap" =~ "~$" ]]; then - if ! "$bootstrap"; then - echo "Error: bootstrap '$bootstrap' failed" >&2 - exit 1 - fi - fi + if [[ -x "$bootstrap" && ! "$bootstrap" =~ "##" && ! "$bootstrap" =~ "~$" ]]; then + if ! "$bootstrap"; then + echo "Error: bootstrap '$bootstrap' failed" >&2 + exit 1 + fi + fi done hash -r @@ -95,12 +95,12 @@ npm install --global pure-prompt YARN=$(brew --prefix yarn)/bin/yarn if (command -v "$YARN" >/dev/null 2>&1); then - # Install yalc. Needed for local-publish - echo "Installing yalc..." - if ! $YARN global add yalc; then - echo "Failed to install yalc" >&2 - else - echo "Successfully installed yalc" - fi + # Install yalc. Needed for local-publish + echo "Installing yalc..." + if ! $YARN global add yalc; then + echo "Failed to install yalc" >&2 + else + echo "Successfully installed yalc" + fi fi {% endif %} diff --git a/.config/zsh/environment##template b/.config/zsh/environment##template index 9ffe6d3..b5da058 100644 --- a/.config/zsh/environment##template +++ b/.config/zsh/environment##template @@ -8,7 +8,8 @@ export GREP_OPTIONS='--color=auto' export PATH=$HOME/.local/bin:$PATH export ZDOTDIR=${ZDOTDIR:-$HOME/.config/zsh} export ZPLUGINDIR=${ZPLUGINDIR:-${ZDOTDIR}/plugins} -export ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR=/opt/homebrew/share/zsh-syntax-highlighting/highlighters +# export ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR=/opt/homebrew/share/zsh-syntax-highlighting/highlighters +export ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR=$ZPLUGINDIR/zsh-syntax-highlighting/highlighters export NVM_DIR=$HOME/.nvm [[ "$(command -v bat)" ]] && export PAGER="bat -p"