Large update to upgrade script, remove unneccessary configs, add additional and fixups

home/.xserverrc

@@ -1,38 +1,7 @@
 #!/bin/sh
+#
+# executed by xinit when using startx
 
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-sysresources=/etc/X11/xinit/.Xresources
-sysmodmap=/etc/X11/xinit/.Xmodmap
-
-export PATH=$HOME/bin:$PATH
-XDG_CONFIG_HOME="$HOME/.config"
-export XDG_CONFIG_HOME
-
-
-# merge in defaults and keymaps
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-if [ -f "$usermodmap" ]; then
-    xmodmap "$usermodmap"
-fi
-
-# start some nice programs
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
- for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
-  [ -x "$f" ] && . "$f"
- done
- unset f
-fi
-
-exec openbox-session
+# make sure to be runnning in authenticated session with logind
+# this will make it so you cannot bypass screenlock by switching terminals
+exec /usr/bin/Xorg -nolisten tcp "$@" vt$XDG_VTNR