From e5d40a204c89eeb0f4739829ba5a248d98a12a97 Mon Sep 17 00:00:00 2001 From: Joe Lillibridge Date: Wed, 4 Dec 2024 11:45:42 -0600 Subject: [PATCH] wip --- .config/zsh/aliases | 2 +- .config/zsh/zsh-unplugged | 8 +++----- .zshrc | 11 ++++++++++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.config/zsh/aliases b/.config/zsh/aliases index 8ff8ed2..6dadc25 100644 --- a/.config/zsh/aliases +++ b/.config/zsh/aliases @@ -44,7 +44,7 @@ alias bv="brew-visit" # a function defined elsewhere # These depend on some installed packages, so just to be safe alias ls="ls -F" [[ "$(command -v lsd)" ]] && alias ls="lsd -F" -[[ "$(command -v bat)" ]] && alias cat="bat" +# [[ "$(command -v bat)" ]] && alias cat="bat" # unneeded, handled by fdellwing/zsh-bat [[ "$(command -v htop)" ]] && alias top="htop" [[ "$(command -v duf)" ]] && alias df="duf" diff --git a/.config/zsh/zsh-unplugged b/.config/zsh/zsh-unplugged index 1ddc24c..01ca2bb 100644 --- a/.config/zsh/zsh-unplugged +++ b/.config/zsh/zsh-unplugged @@ -26,16 +26,14 @@ repos=( # plugins you want loaded last zsh-users/zsh-syntax-highlighting zsh-users/zsh-history-substring-search - zsh-users/zsh-autosuggestions zsh-users/zsh-completions - # zsh-alias-finder and zsh-you-should-use do basically the same thing - # akash329d/zsh-alias-finder MichaelAquilina/zsh-you-should-use fdellwing/zsh-bat zdharma-continuum/fast-syntax-highlighting - unixorn/tumult.plugin.zsh - supercrabtree/k + zsh-users/zsh-autosuggestions ) # now load your plugins plugin-load "${repos[@]}" + + diff --git a/.zshrc b/.zshrc index e247114..c86bf90 100644 --- a/.zshrc +++ b/.zshrc @@ -91,7 +91,10 @@ prompt pure if [ "$system_type" = "Darwin" ]; then [ -f $HOME/.config/op/plugins.sh ] && source ~/.config/op/plugins.sh [ -e $HOME/.iterm2_shell_integration.zsh ] && source $HOME/.iterm2_shell_integration.zsh - [ -f /opt/homebrew/opt/git-extras/share/git-extras/git-extras-completion.zsh ] && source /opt/homebrew/opt/git-extras/share/git-extras/git-extras-completion.zsh + + # is this macos-only? + # [ -f /opt/homebrew/opt/git-extras/share/git-extras/git-extras-completion.zsh ] && source /opt/homebrew/opt/git-extras/share/git-extras/git-extras-completion.zsh + if [ -d /Applications/ShellHistory.app/Contents/Helpers ]; then # adding shhist to PATH, so we can use it from Terminal export PATH="${PATH}:/Applications/ShellHistory.app/Contents/Helpers" @@ -121,4 +124,10 @@ fi eval "$(zoxide init --cmd j zsh)" [[ "$(command -v thefuck)" ]] && eval $(thefuck --alias) + +# This is probably for Linux [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion + +if [ "$system_type" = "Darwin" ]; then + . $(brew --prefix)/share/zsh-autosuggestions/zsh-autosuggestions.zsh +fi \ No newline at end of file