diff --git a/lib/00-homebrew.bash b/lib/00-homebrew.bash
index ef753ed..f0432ad 100644
--- a/lib/00-homebrew.bash
+++ b/lib/00-homebrew.bash
@@ -12,9 +12,10 @@ if [[ "$(uname)" == "Linux" ]]; then
       fi
     done
   fi
+  unset rc
 fi
 
-if [[ "$(uname)" == "Linux" ]]; then
+if [[ "$(uname)" == "Darwin" ]]; then
   #if command -v brew 1>/dev/null 2>&1; then
   if [[ -d /opt/homebrew ]]; then
     eval "$(/opt/homebrew/bin/brew shellenv)"
diff --git a/lib/21-starship.bash b/lib/21-starship.bash
new file mode 100644
index 0000000..73c652d
--- /dev/null
+++ b/lib/21-starship.bash
@@ -0,0 +1,4 @@
+if command -v starship &> /dev/null; then
+  export STARSHIP_CONFIG="${DOTFILES_PATH}/config/starship/starship.toml"
+  eval "$(starship init bash)"
+fi
diff --git a/root.bash b/root.bash
index 22f81d8..576d751 100644
--- a/root.bash
+++ b/root.bash
@@ -34,19 +34,6 @@ do
   fi
 done
 
-complete -c ww
-
-
-
-if command -v starship &> /dev/null; then
-  export STARSHIP_CONFIG="${DOTFILES_PATH}/config/starship/starship.toml"
-  eval "$(starship init bash)"
-else
-  source "${DOTFILES_PATH}/lib/root/ps1.bash"
-fi
-
-
-
 for e in "${HOME}"/.dotfiles-extras/*
 do
   source "${e}"