From cb5738a870a6090ab9e2d8b9e4a2022f349f029a Mon Sep 17 00:00:00 2001
From: Ezri Brimhall <ezri@ezri.dev>
Date: Tue, 12 Mar 2024 19:46:00 -0600
Subject: [PATCH] Made some changes to support non-arch systems better

---
 .config/zsh/env.zsh    | 9 ++++-----
 .config/zsh/prompt.zsh | 2 ++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.config/zsh/env.zsh b/.config/zsh/env.zsh
index 25c707c..0eccad7 100644
--- a/.config/zsh/env.zsh
+++ b/.config/zsh/env.zsh
@@ -5,8 +5,7 @@ PATH_asdf=$ASDF_DATA_DIR/shims:/opt/asdf-vm/bin
 PATH_node=$HOME/.opt/npm/bin
 PATH_java=/usr/lib/jvm/default/bin
 PATH_perl=/usr/bin/vendor_perl:/usr/bin/core_perl
-PATH_system=/usr/local/sbin:/usr/local/bin:/usr/bin
-PATH_system_nonarch=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+PATH_system=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 PATH_user=$HOME/.local/bin
 PATH_wincmake=/opt/msvcmake/bin:/opt/msvc/bin/x64
 
@@ -16,7 +15,7 @@ export PATH=.:$PATH_asdf:$PATH_node:$PATH_pyenv:$PATH_java:$PATH_user:$PATH_syst
 
 # Function to run a command with only the "safe" system PATH element
 function safeexec {
-    env PATH=$PATH_system "$@"
+	env PATH=$PATH_system "$@"
 }
 
 # Set an alias with a trailing space so that we can run other aliases
@@ -26,13 +25,13 @@ alias safeexec="safeexec "
 # Function to run a command with only the user PATH element, forcing
 # the use of user-installed binaries
 function userexec {
-    env PATH=$PATH_user "$@"
+	env PATH=$PATH_user "$@"
 }
 
 export LS_COLORS='di=34;40:ln=1;35;1:so=1;33;1:pi=32;1;40:ex=1;32;1:bd=33;1;40:cd=1;33;1;40:su=1;31;1:sg=1;31;1;40:tw=1;35;1;40:ow=1;31;1;40'
 
 export GPG_TTY=$(tty)
-gpg-connect-agent updatestartuptty /bye &> /dev/null
+gpg-connect-agent updatestartuptty /bye &>/dev/null
 export EDITOR="emacsclient -t"
 
 SAVEHIST=10000
diff --git a/.config/zsh/prompt.zsh b/.config/zsh/prompt.zsh
index 6f56867..db4b3f4 100644
--- a/.config/zsh/prompt.zsh
+++ b/.config/zsh/prompt.zsh
@@ -95,6 +95,7 @@ show_os_icon=1
 # use nerd fonts for icons
 case $OS_ID in
 "arch")
+	os_icon=""
 	show_os_icon=0 # Arch is my default, no need to show icon
 	;;
 "debian")
@@ -104,6 +105,7 @@ case $OS_ID in
 	os_icon=""
 	;;
 *)
+	os_icon="?"
 	show_os_icon=0
 	;;
 esac