diff --git a/.config/shell/profile b/.config/shell/profile
index f0172c9..0933809 100644
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -198,8 +198,5 @@ ex=:\
 *.nix=:\
 "
 
-# Starting X
-if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
-  exec startx
-fi
-
+# Start graphical server on user's current tty if not already running.
+[ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx "$XINITRC"
diff --git a/.xinitrc b/.xinitrc
deleted file mode 120000
index 518bb5d..0000000
--- a/.xinitrc
+++ /dev/null
@@ -1 +0,0 @@
-.config/x11/xinitrc
\ No newline at end of file