Fix ls colors

diff --git a/.config/bash/rc/aliases b/.config/bash/rc/aliases
index 5bfc85fabf0c2d10e9fdc6132f8e49f128a2431b..14cca14972ec723e2ed5eeba0f9e885db0f69732 100644 (file)
--- a/.config/bash/rc/aliases
+++ b/.config/bash/rc/aliases
@@ -1,4 +1,4 @@
-# Git aliases
+# Gjkit aliases
 alias gs='git status -sb '   # Note the trailing space
 alias ga='git add '   # Note the trailing space
 alias gbr='git branch '   # Note the trailing space
@@ -12,30 +12,22 @@ alias gsl='git stash list'
 alias gsp='git stash pop'
 
 alias sl=ls
-alias ls='ls -G'
-alias la='ls -AF'
-alias ll='ls -al'
+alias la='ls -A'
+alias ll='ls -Al'
 alias l1='ls -1'
 alias l.='ls -d .*'
 
-if [ $OSTYPE != *darwin* ]
-then
-  #alias ls="ls --color=auto"
-  alias ls="command ls $LS_COMMON"
-fi
-
-LS_COMMON="-hF"
-#LS_COMMON="$LS_COMMON -I NTUSER.\* -I ntuser.\*"
-
+flags="-hF"
 # Detect which `ls` flavor is in use
-if whence dircolors > /dev/null 2>&1; then # GNU `ls`
+if [ -x "$(which dircolors 2>/dev/null)" ]; then # GNU `ls`
   eval $(dircolors -b $HOME/.dir_colors)
-  colorflag="--color"
+  flags="$flags --color=auto"
+  flags="$flags -I NTUSER.\* -I ntuser.\*"
 else # OS X `ls`
-  #eval $(gdircolors $HOME/.dircolors)
   export CLICOLOR=1
-  colorflag="-G"
+  flags="$flags -G"
 fi
+alias ls="ls $flags"
 
 # Shortcuts
 alias g='git'