From 76aaedc3f9ced9e51323b366c1a686f308eb1ef5 Mon Sep 17 00:00:00 2001 From: Stephen Parkinson Date: Tue, 17 Feb 2026 21:07:13 -0800 Subject: [PATCH] add linux zsh plugins --- setup.sh | 21 ++++++++++++++++----- zsh/aliases | 5 ----- zsh/zshrc | 16 +++++++--------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/setup.sh b/setup.sh index cb64298..f93dc8f 100755 --- a/setup.sh +++ b/setup.sh @@ -19,26 +19,37 @@ if [ "$OSTYPE" = "Linux" ]; then echo "Unknown package manager, continuing..." fi elif [ "$OSTYPE" = "Darwin" ]; then - mkdir ~/Developer + mkdir -p ~/Developer echo "Install Homebrew? [y/n]" read homebrew if [ "$homebrew" = "y" ]; then - /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" echo "Restore from Brewfile? [y/n]" read bundle if [ "$bundle" = "y" ]; then - brew bundle install --file= + brew bundle install else - brew install coreutils fastfetch vim zsh jq python3 zsh-autosuggestions zsh-syntax-highlighting + brew install coreutils fastfetch vim zsh jq python3 fi fi fi +# Clone zsh plugins +PLUGIN_DIR="$HOME/.zsh/plugins" +mkdir -p "$PLUGIN_DIR" +if [ ! -d "$PLUGIN_DIR/zsh-autosuggestions" ]; then + git clone --depth=1 https://github.com/zsh-users/zsh-autosuggestions "$PLUGIN_DIR/zsh-autosuggestions" +fi +if [ ! -d "$PLUGIN_DIR/zsh-syntax-highlighting" ]; then + git clone --depth=1 https://github.com/zsh-users/zsh-syntax-highlighting "$PLUGIN_DIR/zsh-syntax-highlighting" +fi + # silence login message touch ~/.hushlogin # remove common files and symlink new files -rm -r ~/.zshrc ~/.vimrc ~/.tmux.conf ~/.zsh.d ~/.gitconfig ~/.gitignore_global +rm -f ~/.zshrc ~/.vimrc ~/.tmux.conf ~/.gitconfig ~/.gitignore_global +rm -rf ~/.zsh.d mkdir ~/.zsh.d ln -s ~/dotfiles/zsh/aliases ~/.zsh.d/aliases ln -s ~/dotfiles/zsh/functions ~/.zsh.d/functions diff --git a/zsh/aliases b/zsh/aliases index feae08b..13b4168 100644 --- a/zsh/aliases +++ b/zsh/aliases @@ -1,8 +1,3 @@ -# Git -alias gcl='git clone' -alias gp='git push' -alias gs='git status' - # ls alias ll='ls -lah' alias l='ls -CF' diff --git a/zsh/zshrc b/zsh/zshrc index 0e09b05..52889aa 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -60,16 +60,14 @@ fi if [ "$(uname)" = "Darwin" ]; then # set up iterm integration - source ~/.iterm2_shell_integration.zsh + [[ -f ~/.iterm2_shell_integration.zsh ]] && source ~/.iterm2_shell_integration.zsh # source homebrew eval "$(/opt/homebrew/bin/brew shellenv)" - # plugins - source /opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh - source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh fi -# Added by LM Studio CLI (lms) -export PATH="$PATH:/Users/smparkin/.cache/lm-studio/bin" - -# Created by `pipx` on 2025-02-08 01:15:05 -export PATH="$PATH:/Users/smparkin/.local/bin" +# Plugins (cloned into ~/.zsh/plugins by setup.sh) +PLUGIN_DIR="$HOME/.zsh/plugins" +[[ -f "$PLUGIN_DIR/zsh-autosuggestions/zsh-autosuggestions.zsh" ]] && \ + source "$PLUGIN_DIR/zsh-autosuggestions/zsh-autosuggestions.zsh" +[[ -f "$PLUGIN_DIR/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" ]] && \ + source "$PLUGIN_DIR/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"