diff --git a/dot_config/bash/dot_bash_aliases b/dot_config/bash/dot_bash_aliases index 482ff95..b903184 100644 --- a/dot_config/bash/dot_bash_aliases +++ b/dot_config/bash/dot_bash_aliases @@ -154,29 +154,3 @@ alias adb='HOME="$XDG_DATA_HOME"/android adb' if [[ -f $XDG_DATA_HOME/cargo/env ]]; then . "$XDG_DATA_HOME/cargo/env" fi - - -# Final shell specific init -if [[ -n $BASH_VERSION ]]; then - # https://github.com/pkasemir/find-the-command - [[ -f /usr/share/doc/find-the-command/ftc.bash ]] && source /usr/share/doc/find-the-command/ftc.bash noupdate quiet info - # https://wiki.archlinux.org/title/Pkgfile#Command_not_found - # [[ -f /usr/share/doc/pkgfile/command-not-found.bash ]] && source /usr/share/doc/pkgfile/command-not-found.bash - - # Starship after defining custom prompt, easy to remove - eval "$(starship init bash)" - - # Zoxide init has to be last - eval "$(zoxide init bash)" -elif [[ -n $ZSH_VERSION ]]; then - # https://github.com/pkasemir/find-the-command - [[ -f /usr/share/doc/find-the-command/ftc.zsh ]] && source /usr/share/doc/find-the-command/ftc.zsh noupdate quiet info - # https://wiki.archlinux.org/title/Pkgfile#Command_not_found - # [[ -f /usr/share/doc/pkgfile/command-not-found.zsh ]] && source /usr/share/doc/pkgfile/command-not-found.zsh - - # Starship after defining custom prompt, easy to remove - hash starship 2>/dev/null && eval "$(starship init zsh)" - - # Zoxide init has to be last - hash zoxide 2>/dev/null && eval "$(zoxide init zsh)" -fi diff --git a/dot_config/bash/dot_bashrc b/dot_config/bash/dot_bashrc index b405c4d..0a393a8 100644 --- a/dot_config/bash/dot_bashrc +++ b/dot_config/bash/dot_bashrc @@ -26,3 +26,14 @@ export HISTFILE="$XDG_STATE_HOME"/bash/history PS1='[\u@\h \w]\$ ' [[ -f $XDG_CONFIG_HOME/bash/.bash_aliases ]] && source "$XDG_CONFIG_HOME/bash/.bash_aliases" + +# https://github.com/pkasemir/find-the-command +[[ -f /usr/share/doc/find-the-command/ftc.bash ]] && source /usr/share/doc/find-the-command/ftc.bash noupdate quiet info +# https://wiki.archlinux.org/title/Pkgfile#Command_not_found +# [[ -f /usr/share/doc/pkgfile/command-not-found.bash ]] && source /usr/share/doc/pkgfile/command-not-found.bash + +# Starship after defining custom prompt, easy to remove +hash starship 2>/dev/null && eval "$(starship init bash)" + +# Zoxide init has to be last +hash zoxide 2>/dev/null && eval "$(zoxide init bash)" diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index e6dc28b..bb4cb2f 100644 --- a/dot_config/zsh/dot_zshrc +++ b/dot_config/zsh/dot_zshrc @@ -40,3 +40,14 @@ PROMPT="[%n@%m %~]$ " RPROMPT="%?:%h | %*" [[ -f $XDG_CONFIG_HOME/bash/.bash_aliases ]] && source "$XDG_CONFIG_HOME/bash/.bash_aliases" + +# https://github.com/pkasemir/find-the-command +[[ -f /usr/share/doc/find-the-command/ftc.zsh ]] && source /usr/share/doc/find-the-command/ftc.zsh noupdate quiet info +# https://wiki.archlinux.org/title/Pkgfile#Command_not_found +# [[ -f /usr/share/doc/pkgfile/command-not-found.zsh ]] && source /usr/share/doc/pkgfile/command-not-found.zsh + +# Starship after defining custom prompt, easy to remove +hash starship 2>/dev/null && eval "$(starship init zsh)" + +# Zoxide init has to be last +hash zoxide 2>/dev/null && eval "$(zoxide init zsh)"