Enable emptty for Void desktops

dotfiles/common/.bash_profile

@@ -4,7 +4,3 @@
 
 # Get the aliases and functions
 [ -f $HOME/.bashrc ] && . $HOME/.bashrc
-
-if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
-	exec startx
-fi

dotfiles/desktop/.xinitrc

@@ -1,11 +1,20 @@
 #!/bin/sh
 
-# dbus session
-export XDG_CURRENT_DESKTOP=i3
-exec dbus-run-session sh -c "
-    umask 077
-    printf '%s\n' \"\$DBUS_SESSION_BUS_ADDRESS\" > \"\$HOME/.dbus-session-bus-address\"
-    eval \$(ssh-agent -s)
-    gpgconf --launch gpg-agent
-    exec i3
-"
+[ $# -gt 0 ] || set -- i3
+
+[ -r /etc/profile ] && . /etc/profile
+[ -r "$HOME/.profile" ] && . "$HOME/.profile"
+
+session_name=${1##*/}
+
+export XDG_CURRENT_DESKTOP="$session_name"
+export XDG_SESSION_DESKTOP="$session_name"
+export XDG_SESSION_TYPE=x11
+
+exec dbus-run-session sh -eu -c '
+  umask 077
+  printf "%s\n" "$DBUS_SESSION_BUS_ADDRESS" > "$HOME/.dbus-session-bus-address"
+  eval "$(ssh-agent -s)" >/dev/null
+  gpgconf --launch gpg-agent
+  exec "$@"
+' sh "$@"