BREAKING: Use xinit // Deprecate .profile

shell/.profile

@@ -1,33 +0,0 @@
-# ~/.profile: executed by the command interpreter for login shells.
-# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
-# exists.
-# see /usr/share/doc/bash/examples/startup-files for examples.
-# the files are located in the bash-doc package.
-
-# the default umask is set in /etc/profile; for setting the umask
-# for ssh logins, install and configure the libpam-umask package.
-#umask 022
-
-# if running bash
-if [ -n "$BASH_VERSION" ]; then
-    # include .bashrc if it exists
-    if [ -f "$HOME/.bashrc" ]; then
-	. "$HOME/.bashrc"
-    fi
-fi
-
-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/bin" ]; then
-    PATH=$PATH:"$HOME"/bin
-fi
-
-if [ -d "$HOME/.local/bin" ]; then
-    PATH=$PATH:"$HOME"/.local/bin
-fi
-
-# unclock keyring for terminal sessions
-# see https://wiki.archlinux.org/index.php/GNOME/Keyring#With_a_display_manager
-if [ -n "$DESKTOP_SESSION" ]; then
-    eval $(gnome-keyring-daemon --start --daemonize)
-    export SSH_AUTH_SOCK
-fi

shell/.xsessionrc

@@ -1,3 +0,0 @@
-if [ -f $HOME/.profile ]; then
-	. $HOME/.profile
-fi

xinit/.xinitrc

@@ -0,0 +1,37 @@
+# auto-unlocks the gpg and ssh agents
+eval $(gnome-keyring-daemon --start)
+export SSH_AUTH_SOCK
+
+if [ -n "$BASH_VERSION" ]; then
+    # include .bashrc if it exists
+    if [ -f "$HOME/.bashrc" ]; then
+        . "$HOME/.bashrc"
+    fi
+fi
+
+# set PATH so it includes user's private executables
+if [ -d "$HOME/bin" ]; then
+    PATH=$PATH:"$HOME"/bin
+fi
+
+if [ -d "$HOME/.local/bin" ]; then
+    PATH=$PATH:"$HOME"/.local/bin
+fi
+
+# Launch X by running:
+# 	xinit
+#   xinit xfce
+#
+# Or pass this file and the DE/WM arg to startx:
+#   startx ~/.xinitrc bspwm
+
+# This is the default
+session=${1:-bspwm}
+
+# Map arguments to commands.
+case $session in
+    bspwm ) exec bspwm        ;;
+    mate  ) exec mate-session ;;
+    xfce  ) exec startxfce4   ;;
+    *) echo "Unknown session" ;;
+esac

xinit/xserverrc

@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ -z "$XDG_VTNR" ]; then
+  exec /usr/bin/X -nolisten tcp "$@"
+else
+  exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR
+fi