August 2024 Updates

2 files changed, 33 insertions, 26 deletions

diff --git a/bash/.bash_aliases b/bash/.bash_aliases
new file mode 100644
index 0000000..397ab73
--- /dev/null
+++ b/bash/.bash_aliases
@@ -0,0 +1,31 @@
+alias ..="cd ../"
+alias ...="cd ../../"
+alias ls="ls --color=auto"
+alias ll="eza -la --time-style '+%a, %Y-%m-%d %H:%M' --hyperlink"
+alias lr="eza -la --time-style '+%a, %Y-%m-%d %H:%M' --total-size --hyperlink"
+
+alias stw="stow -v --target=$HOME"
+
+alias clip="xclip -selection clipboard"
+alias diff="diff --color=auto"
+alias grep="grep --color=auto"
+alias hss="hugo server --noHTTPCache"
+alias ip="ip --color=auto"
+alias lf="lfub"
+alias lgit="lazygit"
+alias mail="thunderbird"
+alias mus="ncmpcpp"
+alias su="su -"
+alias vim="nvim"
+alias vi="nvim"
+
+alias yp="pwd | clip"
+alias ytdl="yt-dlp"
+alias zeit="tty-clock -C 1 -f %d.%m.%Y -sc"
+alias kwbx="killall CiscoCollabHost"
+alias showoff="fastfetch"
+alias wisdom="fortune -os | cowsay -f tux"
+alias xmap="xmodmap ~/.Xmodmap"
+
+# disabled for fish compatibility :(
+# alias emacs=":(){:|:&};:"
diff --git a/bash/.bashrc b/bash/.bashrc
index eef00e3..c6abc8e 100755
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -25,36 +25,12 @@ source_if_present "$HOME/.config/less/termcap"
 bind '"\t":menu-complete'
 
 # Set aliases
-alias ..="cd ../"
-alias ...="cd ../../"
-alias ls="ls --color=auto"
-alias ll="ls -lah --color=auto"
-
-alias stw="stow -v --target=$HOME"
-
-alias clip="xclip -selection clipboard"
-alias diff="diff --color=auto"
-alias grep="grep --color=auto"
-alias hss="hugo server --noHTTPCache"
-alias ip="ip --color=auto"
-alias lf="lfub"
-alias lgit="lazygit"
-alias mail="thunderbird"
-alias mus="ncmpcpp"
-alias su="su -"
-alias vim="nvim"
-alias emacs=":(){:|:&};:"
-alias yp="pwd | clip"
-alias ytdl="yt-dlp"
-alias zeit="tty-clock -C 1 -f %d.%m.%Y -sc"
-alias kwbx="killall CiscoCollabHost"
-alias showoff="fastfetch"
-alias wisdom="fortune -os | cowsay -f tux"
+source_if_present "$HOME/.bash_aliases"
 
 # Automatically remove these directories, if some pesky program created them again.
 rmdir $HOME/Desktop $HOME/Documents $HOME/Downloads $HOME/Images $HOME/Music $HOME/Templates $HOME/Video 2> /dev/null
 
-export PS1='[\001\e[0;36m\002\j\001\e[0m\002] [ \001\e[0;34m\002\u\001\e[0m\002@\001\e[0;34m\002\h\001\e[0m\002 ] \001\e[0;35m\002\W\001\e[0m\002 \$ '
+# export PS1='[\001\e[0;36m\002\j\001\e[0m\002] [ \001\e[0;34m\002\u\001\e[0m\002@\001\e[0;34m\002\h\001\e[0m\002 ] \001\e[0;35m\002\W\001\e[0m\002 \$ '
 
 # Enable wal colors, if terminal emulator is 'st'
 if [[ "$terminal" = "st" ]]; then