1 files changed, 14 insertions, 12 deletions
diff --git a/bash/dot-bashrc b/bash/dot-bashrc
index 678235f..cc9c324 100644
--- a/bash/dot-bashrc
+++ b/bash/dot-bashrc
@@ -14,21 +14,15 @@ shopt -s checkwinsize
 
 source "${XDG_CONFIG_HOME:-$HOME/.config}"/bash/gentoo-color.bash
 
-ls()
+function ls()
 {
-  if ((gentoo_color > 0)); then
-    command ls --color=auto "$@"
-  else
-    command ls "$@"
-  fi
+  command ls --color=auto --indicator-style=classify --human-readable --literal --group-directories-first -v "$@" # -v is for natural sort of numbers within text
 }
 
 # coreutils
 alias cp='cp -riv'
-alias la='ls -la'
-alias ll='ls -lah'
+alias ll='ls --all -l --human-readable' # -l = long listing format
 alias l='ls -l'
-alias ls='ls -p -hN --group-directories-first'
 alias mkdir='mkdir -pv'
 alias mv='mv -iv'
 alias rm='rm -iv'
@@ -36,12 +30,16 @@ alias ..='echo "cd .."; cd ..'
 alias ...='echo "cd ../.."; cd ../..'
 
 # program aliases
-alias m='neomutt'
+alias m='aerc'
 alias p='sudo pacman'
 alias SS='sudo systemctl'
 alias Su='systemctl --user'
 alias v='nvim'
+alias vn='NVIM_APPNAME=nvim-final nvim'
+alias vv='uv run nvim'
 alias z='setsid runapp -- zathura'
+alias todo='nvim ~/system-notes.md'
+alias neofetch='fastfetch -c examples/13'
 
 # source: https://wiki.archlinux.org/title/GnuPG#Configure_pinentry_to_use_the_correct_TTY
 GPG_TTY="$(tty)"
@@ -50,11 +48,13 @@ gpg-connect-agent updatestartuptty /bye >/dev/null
 
 # cp and mv but with rsync
 # source: https://wiki.archlinux.org/title/Rsync#As_cp/mv_alternative
-cpr() {
+cpr()
+{
   rsync --archive -hh --partial --info=stats1,progress2 --modify-window=1 "$@"
 }
 
-mvr() {
+mvr()
+{
   rsync --archive -hh --partial --info=stats1,progress2 --modify-window=1 --remove-source-files "$@"
 }
 
@@ -62,6 +62,8 @@ source "${XDG_CONFIG_HOME:-$HOME/.config}"/bash/functions.bash
 
 bind '"\C-o":"\C-ulf\C-m"'
 
+source "${XDG_CONFIG_HOME:-$HOME/.config}"/shellshort/shortcutrc
+
 export FZF_DEFAULT_COMMAND='fd --type f --strip-cwd-prefix --hidden --follow --exclude .git'
 export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 eval "$(fzf --bash)"