From c1f1e22fdfcc0dafe5fcc17f74b1fa51a56cdca5 Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Sat, 12 Feb 2022 09:37:37 +0100
Subject: [PATCH] bash_aliases: extend & improve compatibility

---
 .bash_aliases | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/.bash_aliases b/.bash_aliases
index 4158556..2f64282 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -1,17 +1,30 @@
-source ~/.config/shell/functions
-
-_git_prompt=/usr/share/git/completion/git-prompt.sh
-test -f $_git_prompt && source $_git_prompt
-
 # ls aliases
 
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
+export LS_OPTIONS='--human-readable --si --group-directories-first --file-type --dereference-command-line'
+eval "$(dircolors)"
+alias ls='ls --color=auto'
+alias ll='ls $LS_OPTIONS -l --all'
+alias l='ls $LS_OPTIONS --color=always --almost-all'
+which bat >/dev/null || alias bat=batcat
+b() {
+	test -d "${1:-.}" && l "$@" || bat "$@"
+}
+alias v=nvim
+
+# Some aliases to avoid making mistakes:
+
+alias rm='rm -I'
+alias cp='cp -i'
+alias mv='mv -i'
 
 # Fancy prompt
 
-PS1="\[\033[01;32m\]\u\[\033[00m\]:\[\033[01;34m\]\W\[\033[00m\]"
+PS1="\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\W\[\033[00m\]"
 PS1="$PS1 \`if [ \$? = 0 ]; then echo -e '\[\033[01;32m\]:)';"
-PS1="$PS1 else echo -e '\[\033[01;31m\]:(' \$?; fi\`\[\033[00m\]"
-PS1="$PS1 \$(__git_ps1 \"(%s)\") \$ "
+PS1="$PS1 else echo -e '\[\033[01;31m\]' \$?; fi\`\[\033[00m\]"
+
+src() { test -f "$1" && source "$1"; }
+src /usr/share/git/completion/git-prompt.sh && PS1="$PS1\$(__git_ps1 \" (%s)\")"
+src $HOME/.config/shell/functions
+
+PS1="$PS1 \$ "