rename .bash_aliases for conciseness

.aliases

@@ -1,23 +1,21 @@
 # ~/.bash_aliases
 
 # enable color 
-if [ -x /usr/bin/dircolors ]; then
+test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-   test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
 
-   #alias ls='ls -h --color=auto'
+#alias ls='ls -h --color=auto'
-   alias ls='exa -h'
+alias ls='exa -h'
-   alias grep='grep --color=auto'
+alias grep='grep --color=auto'
-   alias fgrep='fgrep --color=auto'
+alias fgrep='fgrep --color=auto'
-   alias egrep='egrep --color=auto'
+alias egrep='egrep --color=auto'
-   alias less='less --use-color'
+alias less='less --use-color'
-   alias diff='diff --color'
+alias diff='diff --color'
-   alias hexedit='hexedit --color'
+alias hexedit='hexedit --color'
-   alias ip='ip --color'
+alias ip='ip --color'
-fi
 
 # ls aliases
-alias ll='ls -alFh'
+alias ll='ls -lFh'
-alias la='ls -Ah'
+alias la='ls -laFh'
 alias l='ls -CFh'
 alias lsa='ls -alh'
 

.bashrc

@@ -72,37 +72,8 @@ xterm*|rxvt*)
     ;;
 esac
 
-# enable color support of ls and also add handy aliases
+if [ -f ~/.aliases ]; then
-#if [ -x /usr/bin/dircolors ]; then
+    . ~/.aliases
-#    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-#    alias ls='ls --color=auto'
-#    #alias dir='dir --color=auto'
-#    #alias vdir='vdir --color=auto'
-#
-#    alias grep='grep --color=auto'
-#    alias fgrep='fgrep --color=auto'
-#    alias egrep='egrep --color=auto'
-#fi
-
-# colored GCC warnings and errors
-#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-
-# some more ls aliases
-#alias ll='ls -alF'
-#alias la='ls -A'
-#alias l='ls -CF'
-
-# Add an "alert" alias for long running commands.  Use like so:
-#   sleep 10; alert
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
 fi
 
 # enable programmable completion features (you don't need to enable
@@ -121,4 +92,4 @@ export EDITOR='nvim'
 export GPG_TTY=$(tty)
 complete -F _todo t
 
-. ~/code/bashPrompt/prompt.sh
+#. ~/code/bashPrompt/prompt.sh