diff --git a/.bash_profile b/.bash_profile
index 2e2d9e6..5112cad 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -8,6 +8,13 @@
 PATH="$HOME/.local/bin:$PATH"
 PATH="$HOME/.config/scripts/bin:$PATH"
 
+if grep "arch-laptop" /etc/hostname &> /dev/null ; then
+	export IS_LAPTOP=1
+fi
+
+# for java applicatons
+export _JAVA_AWT_WM_NONREPARENTING=1
+
 if [[ -z "$DISPLAY" ]] && [[ $(tty) = /dev/tty1 ]]; then
 	if [[ ! -z "$IS_LAPTOP" ]]; then
 		exec startx
diff --git a/.bashrc b/.bashrc
index f4ce51c..a0b2704 100644
--- a/.bashrc
+++ b/.bashrc
@@ -19,18 +19,6 @@ export EDITOR=nvim
 export VISUAL=nvim
 export TERMINAL=alacritty
 
-# for java applicatons
-export _JAVA_AWT_WM_NONREPARENTING=1
-
-# android SDK
-#export ANDROID_SDK_ROOT=/home/sheldonmlee/Library/Android
-#export PATH="$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$PATH"
-#export PATH="$ANDROID_SDK_ROOT/platform-tools:$PATH"
-
-if grep "arch-laptop" /etc/hostname &> /dev/null ; then
-	export IS_LAPTOP=1
-fi
-
 # Path to store working directory
 export WDIR_PATH="/tmp/$(id -u).wdir"