diff --git a/config/zsh/plugins/aliases.zsh b/config/zsh/plugins/aliases.zsh index 3330d3c..30d5b83 100644 --- a/config/zsh/plugins/aliases.zsh +++ b/config/zsh/plugins/aliases.zsh @@ -10,7 +10,6 @@ alias egrep='egrep --color=auto --exclude-dir={.bzr,CVS,.git,.hg,.svn,.idea,.tox alias fgrep='fgrep --color=auto --exclude-dir={.bzr,CVS,.git,.hg,.svn,.idea,.tox}' alias grep='grep --color=auto --exclude-dir={.bzr,CVS,.git,.hg,.svn,.idea,.tox}' alias gti='git' # I quite often mistype `git` as `gti` -alias gf='git fuzzy' alias pp='pnpm' alias px='pnpm dlx' alias pe='pnpm exec' @@ -22,11 +21,11 @@ alias v='nvim' ## Use modern replacements for common GNU programs # {{{ if (( $+commands[exa] )); then - alias ls='exa' - alias l='exa' - alias la='exa -a' - alias ll='exa -lh' - alias lll='exa -lah' + alias ls='eza' + alias l='eza' + alias la='eza -a' + alias ll='eza -lh' + alias lll='eza -lah' else alias l='ls --color=auto' alias la='ls --color=auto -a' diff --git a/scripts/git-setup.sh b/scripts/git-setup.sh index eac32b4..75e4709 100644 --- a/scripts/git-setup.sh +++ b/scripts/git-setup.sh @@ -128,6 +128,13 @@ git_plugins() { git config --global delta.navigate true git config --global delta.features mellow-barbet # theme fi + + if command -v git-fuzzy &>/dev/null; then + git config --global alias.f 'fuzzy' + git config --global alias.fd 'fuzzy diff' + git config --global alias.fs 'fuzzy status' + git config --global alias.fl 'fuzzy log' + fi } # Initial git config setup