From e4a34dc4f22cbd1d0eadae8a8597815d76187348 Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen+git@mikaela.info>
Date: Wed, 29 May 2024 15:19:06 +0300
Subject: [PATCH] {bash,zsh}rc: stop forcing colors, case-insentive grep + fix
 {f,e}grep

---
 rc/bashrc | 18 +++++++++---------
 rc/zshrc  | 16 +++++++++-------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/rc/bashrc b/rc/bashrc
index c7944bca..3c0f0824 100755
--- a/rc/bashrc
+++ b/rc/bashrc
@@ -87,18 +87,18 @@ esac
 # enable color support of ls and also add handy aliases
 if [ -x /usr/bin/dircolors ]; then
 	test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-	alias ls='ls --color=always'
-	alias dir='dir --color=always'
-	alias vdir='vdir --color=always'
+	alias ls='ls --color=auto'
+	alias dir='dir --color=auto'
+	alias vdir='vdir --color=auto'
 
-	alias grep='grep -i --color=always'
-	alias fgrep='fgrep -i --color=always'
-	alias egrep='egrep -i --color=always'
+	alias grep='grep --color=auto'
+	alias fgrep='grep -F --color=auto'
+	alias egrep='grep -E --color=auto'
 fi
 
 # some more ls aliases
 if [[ $UNAME != Darwin ]]; then
-	alias ll='ls -alFh --color=always' && alias la='ls -A --color=always' && alias l='ls -CF --color=always'
+	alias ll='ls -alFh --color=auto' && alias la='ls -A --color=auto' && alias l='ls -CF --color=auto'
 fi
 
 if [[ $UNAME == Darwin ]]; then
@@ -329,11 +329,11 @@ alias supybot-generate-messages.pot-mass="find . -type d -exec sh -c '(cd {} &&
 
 # enable color support of ls and also add handy aliases
 if [[ $UNAME != Darwin ]]; then
-	alias ls='ls --color=always'
+	alias ls='ls --color=auto'
 fi
 # some more ls aliases
 if [[ $UNAME != Darwin ]]; then
-	alias ll='ls -alFh --color=always' && alias la='ls -A --color=always' && alias l='ls -CF --color=always'
+	alias ll='ls -alFh --color=auto' && alias la='ls -A --color=auto' && alias l='ls -CF --color=auto'
 fi
 
 ## -- End of aliases which are saved from Ubuntu default bashrc. --
diff --git a/rc/zshrc b/rc/zshrc
index d1e74ad6..b6628f42 100755
--- a/rc/zshrc
+++ b/rc/zshrc
@@ -299,16 +299,18 @@ alias theme="prompt "
 
 # enable color support of ls and also add handy aliases
 if [[ $UNAME != Darwin ]]; then
-	alias ls='ls --color=always'
+	alias ls='ls --color=auto'
 fi
-alias dir='dir --color=always'
-alias vdir='vdir --color=always'
-alias grep='grep -i --color=always'
-alias fgrep='fgrep -i --color=always'
-alias egrep='egrep -i --color=always'
+alias dir='dir --color=auto'
+alias vdir='vdir --color=auto'
+
+alias grep='grep --color=auto'
+alias fgrep='fgrep -F --color=auto'
+alias egrep='egrep -E --color=auto'
+
 # some more ls aliases
 if [[ "$UNAME" != "Darwin" ]]; then
-	alias ll='ls -alFh --color=always' && alias la='ls -A --color=always' && alias l='ls -CF --color=always'
+	alias ll='ls -alFh --color=auto' && alias la='ls -A --color=auto' && alias l='ls -CF --color=auto'
 fi
 
 if [[ $UNAME = Darwin ]]; then