diff options
| author | Paul Buetow <paul@buetow.org> | 2025-03-04 11:59:41 +0200 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2025-03-04 11:59:41 +0200 |
| commit | 00e7a603b3b2a9d967dc82ab1d4fd3c72bdffd2d (patch) | |
| tree | f402deca8cb3cbd24ccbb13b7b11c6dbfe741d84 | |
| parent | f43cb19912ce5b7fa41670b267e0e806bd2090b1 (diff) | |
| parent | 8c54b94061248d3617e7e2450a16d8434f4ff798 (diff) | |
Merge branch 'master' of codeberg.org:snonux/rexfiles
| -rw-r--r-- | dotfiles/zsh/zshrc_d/alternatives.source.zsh | 10 | ||||
| -rw-r--r-- | dotfiles/zsh/zshrc_d/utils.source.zsh | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/dotfiles/zsh/zshrc_d/alternatives.source.zsh b/dotfiles/zsh/zshrc_d/alternatives.source.zsh index 1e94ffc..55e7487 100644 --- a/dotfiles/zsh/zshrc_d/alternatives.source.zsh +++ b/dotfiles/zsh/zshrc_d/alternatives.source.zsh @@ -3,19 +3,23 @@ alternatives::aliases () { } alternatives::init () { - if [[ -f /usr/bin/bat || -f /usr/local/bin/bat ]]; then + if command -v bat; then alias Cat=/usr/bin/cat alias cat=bat fi - if [[ -f /usr/bin/bit || -f /usr/local/bin/bit ]]; then + if command -v bit; then alias Git=/usr/bin/git alias git=bit fi - if [[ -f /usr/bin/procs || -f /usr/local/bin/procs ]]; then + if command -v procs; then alias p='procs' fi + + if command -v zoxide; then + source <(zoxide init zsh) + fi } alternatives::init diff --git a/dotfiles/zsh/zshrc_d/utils.source.zsh b/dotfiles/zsh/zshrc_d/utils.source.zsh index a4c3a2c..5f24f39 100644 --- a/dotfiles/zsh/zshrc_d/utils.source.zsh +++ b/dotfiles/zsh/zshrc_d/utils.source.zsh @@ -459,4 +459,7 @@ tv::text () { } zle -N tv::text bindkey -M viins '^x' tv::text +<<<<<<< HEAD +======= +>>>>>>> afa49348257597a6087692d0f80a80ccf8ea2273 |