diff --git a/shell/.bashrc b/shell/.bashrc
index c904860..49b9526 100644
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -5,12 +5,19 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
-alias ls='ls --color=auto'
+shopt -s histappend
+PROMPT_COMMAND="history -a; history -n; $PROMPT_COMMAND"
+
 PS1='\e[34m\u@\h\e[0m \e[32m\W\e[0m \$ '
 
+HISTTIMEFORMAT='%F %R  '
+
 function before_command() { echo -ne '\e[2 q'; }
 trap before_command DEBUG
 
+# Aliases.
+for f in ~/.config/shellconfig/*.sh; do source "$f"; done
+
 if [[ -f /usr/share/bash-completion/bash_completion ]]; then
     . /usr/share/bash-completion/bash_completion
 fi
diff --git a/shell/.config/shellconfig/aliases.sh b/shell/.config/shellconfig/aliases.sh
index cf720f1..0d062e3 100644
--- a/shell/.config/shellconfig/aliases.sh
+++ b/shell/.config/shellconfig/aliases.sh
@@ -1,5 +1,6 @@
 alias v=nvim
 alias k=kak
+alias hs='history $HISTSIZE | rg'
 alias kc='kak -c "$(kak -l | kff)"'
 alias kf='fd -t f | kff | xargs kd'
 alias kh='fd -H -t f | kff | xargs kd'
@@ -13,14 +14,6 @@ alias z='cd $(fd -t d --one-file-system . ~ | kff)'
 
 eval $(dircolors)
 
-if alias st > /dev/null; then
-	alias gst='_vcs status'
-	unalias st
-fi
-if alias r > /dev/null; then
-	unalias r
-fi
-
 alias nocaps='setxkbmap pl -option ctrl:nocaps'
 alias fixdp='xrandr --output DP-0 --right-of DP-2'
 alias a4='COLORTERM=truecolor TERM=xterm-256color a4'
diff --git a/shell/.config/shellconfig/aliases.zsh b/shell/.config/shellconfig/aliases.zsh
index 86391eb..bab1333 100644
--- a/shell/.config/shellconfig/aliases.zsh
+++ b/shell/.config/shellconfig/aliases.zsh
@@ -2,3 +2,11 @@ alias hs='history -$HISTSIZE | rg'
 
 alias -s pdf=zathura
 alias -s {jpg,jpeg,png}=sxiv
+
+if alias st > /dev/null; then
+	alias gst='_vcs status'
+	unalias st
+fi
+if alias r > /dev/null; then
+	unalias r
+fi