about summary refs log tree commit diff
path: root/.config/zsh/utils.zsh
diff options
context:
space:
mode:
Diffstat (limited to '.config/zsh/utils.zsh')
-rw-r--r--.config/zsh/utils.zsh15
1 files changed, 10 insertions, 5 deletions
diff --git a/.config/zsh/utils.zsh b/.config/zsh/utils.zsh
index bc986d9..2d292ea 100644
--- a/.config/zsh/utils.zsh
+++ b/.config/zsh/utils.zsh
@@ -23,13 +23,13 @@ unset grep_opts
 if has eza; then
 	alias ls='eza'
 	alias ll='eza --long --header --all'
-elif ls --color &> /dev/null; then
+elif ls --almost-all &> /dev/null; then
 	alias ls='ls --color=auto'
-	alias ll='ls -l --almost-all --no-group --human-readable'
+	alias ll='ls -l --almost-all --no-group --human-readable --color=auto'
 else
 	# bsd/mac ls
-	export CLICOLOR='1'
-	alias ll='ls -hoA'
+	alias ls='ls -G'
+	alias ll='ls -hoAG'
 fi
 
 # tree
@@ -42,7 +42,12 @@ alias mkdir='mkdir -p'
 alias dd="dd status=progress oflag=direct,sync"
 
 ## df
-alias df="df -TH --exclude-type=tmpfs --exclude-type=devtmpfs --exclude-type=squashfs"
+if df --exclude-type=tmpfs &> /dev/null; then
+	alias df="df -TH --exclude-type=tmpfs --exclude-type=devtmpfs --exclude-type=squashfs --exclude-type=udev"
+else
+	# bsd/mac df
+	alias df="df -YH -T noautofs,devfs,tmpfs,squashfs"
+fi
 
 # gpg
 has gpg2 && alias gpg='gpg2'