diff --git a/.zshenv b/.zshenv
new file mode 100644
index 0000000..2998e31
--- /dev/null
+++ b/.zshenv
@@ -0,0 +1,50 @@
+########## Personal - Determine OS and Set Variables ##########################
+if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+    # Linux
+    OSNAME=Linux
+
+    if [ -f /etc/os-release ]; then
+        . /etc/os-release
+        DISTRO=$NAME
+        VER=$VERSION_ID
+    elif type lsb_release >/dev/null 2>&1; then
+        DISTRO=$(lsb_release -si)
+        VER=$(lsb_release -sr)
+    elif [ -f /etc/lsb-release ]; then
+        . /etc/lsb-release
+        DISTRO=$DISTRIB_ID
+        VER=$DISTRIB_RELEASE
+    elif [ -f /etc/debian_version ]; then
+        DISTRO=Debian
+        VER=$(cat /etc/debian_version)
+    else
+        # Fall back to uname
+        DISTRO=$(uname -s)
+        VER=$(uname -r)
+    fi
+
+    if command -v dpkg &> /dev/null; then
+        # Debian-based
+        DISTRO_TYPE=debian
+    elif command -v yum &> /dev/null; then
+        # RPM-based
+        DISTRO_TYPE=rpm
+    elif command -v pacman &> /dev/null; then
+        # Arch-based
+        DISTRO_TYPE=arc
+    fi
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+    # macOS
+    OSNAME=macOS
+    VER=$(sw_vers | grep ProductVersion | cut -c 17-)
+else
+    # Fall back to uname
+    OSNAME=$(uname -s)
+    VER=$(uname -r)
+fi
+
+ARCH=$(uname -m)
+
+export OSNAME DISTRO DISTRO_TYPE VER ARCH
+
+
diff --git a/.zshrc b/.zshrc
index 1718bac..eb41dcc 100644
--- a/.zshrc
+++ b/.zshrc
@@ -7,56 +7,6 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
 fi
 
 
-########## Personal - Determine OS and Set Variables ##########################
-if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    # Linux
-    OSNAME=Linux
-
-    if [ -f /etc/os-release ]; then
-        . /etc/os-release
-        DISTRO=$NAME
-        VER=$VERSION_ID
-    elif type lsb_release >/dev/null 2>&1; then
-        DISTRO=$(lsb_release -si)
-        VER=$(lsb_release -sr)
-    elif [ -f /etc/lsb-release ]; then
-        . /etc/lsb-release
-        DISTRO=$DISTRIB_ID
-        VER=$DISTRIB_RELEASE
-    elif [ -f /etc/debian_version ]; then
-        DISTRO=Debian
-        VER=$(cat /etc/debian_version)
-    else
-        # Fall back to uname
-        DISTRO=$(uname -s)
-        VER=$(uname -r)
-    fi
-
-    if command -v dpkg &> /dev/null; then
-        # Debian-based
-        DISTRO_TYPE=debian
-    elif command -v yum &> /dev/null; then
-        # RPM-based
-        DISTRO_TYPE=rpm
-    elif command -v pacman &> /dev/null; then
-        # Arch-based
-        DISTRO_TYPE=arc
-    fi
-elif [[ "$OSTYPE" == "darwin"* ]]; then
-    # macOS
-    OSNAME=macOS
-    VER=$(sw_vers | grep ProductVersion | cut -c 17-)
-else
-    # Fall back to uname
-    OSNAME=$(uname -s)
-    VER=$(uname -r)
-fi
-
-ARCH=$(uname -m)
-
-export OSNAME DISTRO DISTRO_TYPE VER ARCH
-
-
 ########## Zinit ##############################################################
 ### Added by Zinit's installerW
 if [[ ! -f $HOME/.local/share/zinit/zinit.git/zinit.zsh ]]; then