.bashrc: sort aliases and move shell hooks to the end

1 files changed, 31 insertions, 51 deletions

diff --git a/.bashrc b/.bashrc
index 10b1187..6c21752 100644
--- a/.bashrc
+++ b/.bashrc
@@ -29,40 +29,10 @@ HISTSIZE=50000
 HISTFILESIZE=500000
 HISTCONTROL=ignorespace
 
-# enable direnv
-eval "$(direnv hook bash)"
-# enable navi
-eval "$(navi widget bash)"
-# enable z.lua
-eval "$(luajit /usr/libexec/z_lua/z.lua --init bash enhanced once fzf)"
-# safe_load /usr/libexec/z_lua/czmod/czmod.bash
-
-# enable starship
-eval "$(starship init bash)"
-
-# Use keychain to reuse the ssh-agent and gpg-agent between logins
-eval "$(keychain --eval --agents ssh,gpg -q id_ed25519)" # AF6AB8C8B10436B9F61293632143BD2AAB94BCC4
-# safe_load "$HOME/.keychain/$(hostname)-sh"
-# safe_load "$HOME/.keychain/$(hostname)-sh-gpg"
-
-# Set prompt
-# export PS1="$(prompt)"
-# if ! [[ "${PROMPT_COMMAND:-}" =~ _prompt_hook ]]; then
-# 	PROMPT_COMMAND="_prompt_hook${PROMPT_COMMAND:+;$PROMPT_COMMAND}"
-# fi
-# _prompt_hook() {
-# 	if [ "$?" != 0 ]; then
-# 		PS1=$(prompt err)
-# 	else
-# 		PS1=$(prompt)
-# 	fi
-# }
-
 # set window title
 _set_win_title() {
 	printf '\033]0;%s\007' "${PWD} (${HOSTNAME}) - FOOT"
 }
-
 # OSC7 escapte sequence
 # https://codeberg.org/dnkl/foot/wiki#spawning-new-terminal-instances-in-the-current-working-directory
 _osc7_cwd() {
@@ -80,14 +50,12 @@ _osc7_cwd() {
 	printf '\e]7;file://%s%s\e\\' "${HOSTNAME}" "${encoded}"
 }
 # PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }_osc7_cwd
-
 # OSC133 command prompt marker
 # https://codeberg.org/dnkl/foot/wiki#jumping-between-prompts
 _osc133_marker() {
 	printf '\e]133;A\e\\'
 }
 # PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }_osc133_marker
-
 # starship precmd
 _starship_precmd_user() {
 	_osc7_cwd
@@ -98,30 +66,42 @@ starship_precmd_user_func="_starship_precmd_user"
 
 # Alias shell commands
 # alias logout='dbus-send --session --type=method_call --print-reply --dest='
-alias vim=nvim
-alias v=nvim
-alias nv=nvim
-alias g=git
-alias l='exa --long --classify --group --header --group-directories-first'
-alias lt='exa --classify --group-directories-first -T'
 alias ..='cd ..'
-alias grep='grep --color=auto'
-alias cat=bat
-alias ssh='TERM=xterm-256color ssh'
-alias balssh='ssh -p 22222 -o User=root -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o Compression=yes'
 alias balscp='scp -P 22222 -o User=root -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o Compression=yes'
+alias balssh='ssh -p 22222 -o User=root -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o Compression=yes'
+#alias cat=bat
+alias dao=doas
+alias daos=doas
+alias daso=doas
+alias dosa=doas
+alias fm=vifm
+alias g=git
+alias grep='grep --color=auto'
 alias k=kubectl
+alias l='exa --long --classify --group --header --group-directories-first'
+alias lt='exa --classify --group-directories-first -T'
+alias nv=nvim
 alias org='nvim +Orgmode'
-alias suspend=loginctl\ suspend
-alias fm=vifm
-alias rsy=rsyncez
 alias rm=saferm
+alias rsy=rsyncez
+alias srv='rclone serve http --addr=0.0.0.0:8080 .'
+alias ssh='TERM=xterm-256color ssh'
+alias suspend=loginctl\ suspend
+alias tt=timetrace
+alias v=nvim
+alias vim=nvim
 alias wlc=wl-copy
 alias wlp=wl-paste
-alias tt=timetrace
-alias srv='rclone serve http --addr=0.0.0.0:8080 .'
 
-alias daos=doas
-alias dao=doas
-alias daso=doas
-alias dosa=doas
+# enable direnv
+[ -x "$(command -v direnv)" ] && eval "$(direnv hook bash)"
+# enable navi
+[ -x "$(command -v navi)" ] && eval "$(navi widget bash)"
+# enable z_lua
+[ -d "/usr/libexec/z_lua" ] && eval "$(luajit /usr/libexec/z_lua/z.lua --init bash enhanced once fzf)"
+# enable starship
+[ -x "$(command -v starship)" ] && eval "$(starship init bash)"
+# Use keychain to reuse the ssh-agent and gpg-agent between logins
+[ -x "$(command -v keychain)" ] && eval "$(keychain --eval --agents ssh,gpg -q id_ed25519)" # AF6AB8C8B10436B9F61293632143BD2AAB94BCC4
+# safe_load "$HOME/.keychain/$(hostname)-sh"
+# safe_load "$HOME/.keychain/$(hostname)-sh-gpg"