From 67b6cb307146342779e4dd9c5c9f2691cba58324 Mon Sep 17 00:00:00 2001
From: Brian Zalewski <brian@megabyte.space>
Date: Tue, 25 Oct 2022 21:50:59 +0000
Subject: [PATCH] Update dotfiles/.profile, dotfiles/.bashrc, dotfiles/.zshrc

---
 dotfiles/.bashrc  |  9 +++++++++
 dotfiles/.profile | 29 ++++++++++-------------------
 dotfiles/.zshrc   |  9 +++++++++
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc
index b720696b..5aa9db62 100644
--- a/dotfiles/.bashrc
+++ b/dotfiles/.bashrc
@@ -143,6 +143,15 @@ if [ "$0" = 'bash' ] || [ "$0" = '/bin/bash' ]; then
   	PS1="\n \[\033[0;34m\]╭─\[\033[0;31m\]\[\033[0;37m\]\[\033[41m\] $OS_ICON \u \[\033[0m\]\[\033[0;31m\]\[\033[44m\]\[\033[0;34m\]\[\033[44m\]\[\033[0;30m\]\[\033[44m\] \w \[\033[0m\]\[\033[0;34m\] \n \[\033[0;34m\]╰ \[\033[1;36m\]\$ \[\033[0m\]"
   	;;
   esac
+
+  # https://github.com/trapd00r/LS_COLORS
+  command -v gdircolors >/dev/null 2>&1 || alias gdircolors="dircolors"
+  if type gdircolors &> /dev/null && [ -f "$HOME/.config/dircolors" ]; then
+	  eval "$(gdircolors -b "$HOME/.config/dircolors")"
+  fi
+
+  # Prefer US English
+  export LC_ALL="en_US.UTF-8"
 fi
 
 ### Miscellaneous
diff --git a/dotfiles/.profile b/dotfiles/.profile
index 88ebb4fa..5a84311a 100644
--- a/dotfiles/.profile
+++ b/dotfiles/.profile
@@ -229,18 +229,9 @@ export EDITOR="vim"
 # Don’t clear the screen after quitting a manual page
 export MANPAGER="less -X"
 
-# Prefer US English and use UTF-8
-if [ -e locale-gen ]; then
-  export LC_ALL="en_US.UTF-8"
-fi
+# Set language
 export LANG="en_US"
 
-# https://github.com/trapd00r/LS_COLORS
-command -v gdircolors >/dev/null 2>&1 || alias gdircolors="dircolors"
-if type gdircolors &> /dev/null && [ -f "$HOME/.config/dircolors" ]; then
-	eval "$(gdircolors -b "$HOME/.config/dircolors")"
-fi
-
 ### .local/bin
 export PATH="$PATH:$HOME/.local/bin"
 
@@ -264,16 +255,16 @@ if [ -e /home/linuxbrew/.linuxbrew/bin/brew ]; then
 fi
 
 if command -v brew > /dev/null; then
-    ### Go
-    export GOPATH="${HOME}/.local/go"
-    export GOROOT="$(brew --prefix golang)/libexec"
-    export GO111MODULE=on
-    export PATH="$PATH:${GOPATH}/bin:${GOROOT}/bin"
+  ### Go
+  export GOPATH="${HOME}/.local/go"
+  export GOROOT="$(brew --prefix golang)/libexec"
+  export GO111MODULE=on
+  export PATH="$PATH:${GOPATH}/bin:${GOROOT}/bin"
 
-    ### ASDF
-    if [ -f "$(brew --prefix asdf)/libexec/asdf.sh" ]; then
-      . $(brew --prefix asdf)/libexec/asdf.sh
-    fi
+  ### ASDF
+  if [ -f "$(brew --prefix asdf)/libexec/asdf.sh" ]; then
+    . $(brew --prefix asdf)/libexec/asdf.sh
+  fi
 fi
 
 ### Android Studio
diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc
index 98d008ff..a4687175 100644
--- a/dotfiles/.zshrc
+++ b/dotfiles/.zshrc
@@ -151,6 +151,15 @@ xterm*|rxvt*|Eterm|aterm|kterm|gnome*|alacritty)
 	;;
 esac
 
+# https://github.com/trapd00r/LS_COLORS
+command -v gdircolors >/dev/null 2>&1 || alias gdircolors="dircolors"
+if type gdircolors &> /dev/null && [ -f "$HOME/.config/dircolors" ]; then
+	eval "$(gdircolors -b "$HOME/.config/dircolors")"
+fi
+
+# Prefer US English
+export LC_ALL="en_US.UTF-8"
+
 # ------------------------------- ZSH PLUGINS ---------------------------------
 # Plugin source helper
 _source_plugin() {