install

@@ -217,16 +217,6 @@ if [ "$(id -u)" == "0" ]; then
 	echo 'Dpkg::Progress-Fancy "1";' > /etc/apt/apt.conf.d/99progressbar
 	echo 'APT::Color "1";' > /etc/apt/apt.conf.d/99color
 
-	# Workarounds for Debian binary names
-	# nodejs -> node was traditionally an eternity issue for me
-	if [[ -f /usr/bin/nodejs && ! -f /usr/bin/node ]]; then
-		ln -nsfv /usr/bin/nodejs /usr/local/bin/node
-	fi
-	# batcat? I expect bat everywhere rather than Bacula
-	if [[ -f /usr/bin/batcat && ! -f /usr/bin/btraceback && ! -f bsmtp ]]; then
-		ln -nsfv /usr/bin/batcat /usr/local/bin/bat
-	fi
-
 	# If some locate variant is installed, now is a great time to ensure its
 	# database is up-to-date. This may also enable automated database
 	# updates.
@@ -255,9 +245,8 @@ if [ "$(id -u)" == "0" ]; then
 		ln -nsfv $HOME/.shell-things/submodules/Inclusive-Sans/fonts/variable /usr/local/share/fonts/Inclusive-Sans
 	fi
 
-	# Symlink cleanup
+	# Font cleanup
 	if hash symlinks 2> /dev/null; then
-		symlinks -d /usr/local/bin
 		symlinks -d /usr/local/share/fonts/
 	else
 		echo "WARNING! Executable named symlinks not found in PATH."

rc/bashrc

@@ -171,9 +171,9 @@ if hash lsb_release 2> /dev/null; then
 			# Confusion between bat and batcula is not a concern at this
 			# point.
 			if hash bat 2> /dev/null; then
-				bat --force-colorization --italic-text=always --style=plain $HOME/.shell-things/.mikaela/motivational-message.md | \grep -v '#' | uniq -u
+				bat --force-colorization --italic-text=always --style=plain $HOME/.shell-things/.mikaela/motivational-message.md | \grep -v '#'
 			else
-				tail -n +1 $HOME/.shell-things/.mikaela/motivational-message.md | grep -v '#' | uniq -u
+				tail -n +1 $HOME/.shell-things/.mikaela/motivational-message.md | grep -v '#'
 			fi
 		fi
 	elif [[ "$(id -u)" == "0" ]]; then
@@ -688,7 +688,7 @@ fi
 # and Ubuntu. This will not be done in that case
 if ! hash btraceback 2> /dev/null; then
 	if hash bat 2> /dev/null; then
-		alias cat="bat -pp"
+		alias cat=bat
 		alias multicat=bat
 		alias less="bat --paging=always"
 		export MANPAGER="sh -c 'sed -u -e \"s/\\x1B\[[0-9;]*m//g; s/.\\x08//g\" | bat -p -lman'"
@@ -696,10 +696,8 @@ if ! hash btraceback 2> /dev/null; then
 		#alias -g -- -h='-h 2>&1 | bat --language=help --style=plain'
 		#alias -g -- --help='--help 2>&1 | bat --language=help --style=plain'
 	fi
-	if hash rg 2> /dev/null; then
+	if hash batgrep 2> /dev/null; then
-		if hash batgrep 2> /dev/null; then
+		alias grep=batgrep
-			alias grep=batgrep
-		fi
 	fi
 	if hash batman 2> /dev/null; then
 		eval "$(batman --export-env)"

rc/zshrc

@@ -67,9 +67,9 @@ if hash lsb_release 2> /dev/null; then
 			# Confusion between bat and batcula is not a concern at this
 			# point.
 			if hash bat 2> /dev/null; then
-				bat --force-colorization --italic-text=always --style=plain $HOME/.shell-things/.mikaela/motivational-message.md | \grep -v '#' | uniq -u
+				bat --force-colorization --italic-text=always --style=plain $HOME/.shell-things/.mikaela/motivational-message.md | \grep -v '#'
 			else
-				tail -n +1 $HOME/.shell-things/.mikaela/motivational-message.md | grep -v '#' | uniq -u
+				tail -n +1 $HOME/.shell-things/.mikaela/motivational-message.md | grep -v '#'
 			fi
 		fi
 	elif [[ "$(id -u)" == "0" ]]; then
@@ -676,7 +676,7 @@ fi
 # and Ubuntu. This will not be done in that case
 if ! hash btraceback 2> /dev/null; then
 	if hash bat 2> /dev/null; then
-		alias cat="bat -pp"
+		alias cat=bat
 		alias multicat=bat
 		alias less="bat --paging=always"
 		export MANPAGER="sh -c 'sed -u -e \"s/\\x1B\[[0-9;]*m//g; s/.\\x08//g\" | bat -p -lman'"
@@ -684,10 +684,8 @@ if ! hash btraceback 2> /dev/null; then
 		alias -g -- -h='-h 2>&1 | bat --language=help --style=plain'
 		alias -g -- --help='--help 2>&1 | bat --language=help --style=plain'
 	fi
-	if hash rg 2> /dev/null; then
+	if hash batgrep 2> /dev/null; then
-		if hash batgrep 2> /dev/null; then
+		alias grep=batgrep
-			alias grep=batgrep
-		fi
 	fi
 	if hash batman 2> /dev/null; then
 		eval "$(batman --export-env)"