From aac665079857e0a7d3cc0d53e8435f4dcb4dc272 Mon Sep 17 00:00:00 2001
From: Dayyan <gj8916@myamu.ac.in>
Date: Tue, 16 Jul 2024 08:32:19 +0530
Subject: [PATCH 1/2] changed lsb_release -si to distribution()

I use EndeavourOS and lsb_release -si returns as such Soo it doesnt match Arch on my OS, And theres already a defined function which returns the distribution so changed to that and now it works cat is aliased for bat on endeeavourOS and any arch or redhat system hopefully.
---
 .bashrc | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/.bashrc b/.bashrc
index 30a67f5..d529521 100644
--- a/.bashrc
+++ b/.bashrc
@@ -71,17 +71,17 @@ alias snano='sedit'
 alias vim='nvim'
 
 # Replace batcat with cat on Fedora as batcat is not available as a RPM in any form
-if command -v lsb_release >/dev/null; then
-    DISTRIBUTION=$(lsb_release -si)
-else
-    DISTRIBUTION=$(cat /etc/os-release | grep ^ID= | cut -d'=' -f2)
-fi
-
-if [ "$DISTRIBUTION" = "Fedora" ] || [ "$DISTRIBUTION" = "Arch" ]; then
-	alias cat='bat'
-else
-	alias cat='batcat'
-fi
+#if command -v lsb_release >/dev/null; then
+#    DISTRIBUTION=$(lsb_release -si)
+#else
+#    DISTRIBUTION=$(cat /etc/os-release | grep ^ID= | cut -d'=' -f2)
+#fi
+#
+#if [ "$DISTRIBUTION" = "Fedora" ] || [ "$DISTRIBUTION" = "Arch" ]; then
+#	alias cat='bat'
+#else
+#	alias cat='batcat'
+#fi
 
 # To have colors for ls and all grep commands such as grep, egrep and zgrep
 export CLICOLOR=1
@@ -429,6 +429,14 @@ distribution () {
     echo $dtype
 }
 
+
+DISTRIBUTION=$(distribution)
+if [ "$DISTRIBUTION" = "redhat" ] || [ "$DISTRIBUTION" = "arch" ]; then
+      alias cat='bat'
+else
+      alias cat='batcat'
+fi 
+
 # Show the current version of the operating system
 ver() {
     local dtype
@@ -637,4 +645,4 @@ fi
 export PATH=$PATH:"$HOME/.local/bin:$HOME/.cargo/bin:/var/lib/flatpak/exports/bin:/.local/share/flatpak/exports/bin"
 
 eval "$(starship init bash)"
-eval "$(zoxide init bash)"
\ No newline at end of file
+eval "$(zoxide init bash)"

From ef270be5820ce7b765e3e6ce2db8decfd4e51338 Mon Sep 17 00:00:00 2001
From: Chris Titus <contact@christitus.com>
Date: Mon, 15 Jul 2024 22:54:59 -0500
Subject: [PATCH 2/2] Update .bashrc

---
 .bashrc | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/.bashrc b/.bashrc
index d529521..3225e61 100644
--- a/.bashrc
+++ b/.bashrc
@@ -70,19 +70,6 @@ alias nano='edit'
 alias snano='sedit'
 alias vim='nvim'
 
-# Replace batcat with cat on Fedora as batcat is not available as a RPM in any form
-#if command -v lsb_release >/dev/null; then
-#    DISTRIBUTION=$(lsb_release -si)
-#else
-#    DISTRIBUTION=$(cat /etc/os-release | grep ^ID= | cut -d'=' -f2)
-#fi
-#
-#if [ "$DISTRIBUTION" = "Fedora" ] || [ "$DISTRIBUTION" = "Arch" ]; then
-#	alias cat='bat'
-#else
-#	alias cat='batcat'
-#fi
-
 # To have colors for ls and all grep commands such as grep, egrep and zgrep
 export CLICOLOR=1
 export LS_COLORS='no=00:fi=00:di=00;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.ogg=01;35:*.mp3=01;35:*.wav=01;35:*.xml=00;31:'