Correctly set SSH_AGENT_SOCKET

[max/dotfiles.git] / X / .xinitrc

diff --git a/X/.xinitrc b/X/.xinitrc
index a0f6e2a8aab0c1e9a4178eec6aa79fd7662032a0..d12fed36880d81edf04301556cc8b2a25d3e4bdc 100644 (file)
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -12,19 +12,18 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
   unset f
 fi
 
+# Source ~/.xprofile
+[ -f /etc/xprofile ] && . /etc/xprofile
+[ -f ~/.xprofile ] && . ~/.xprofile
+case $HOSTNAME in
+  magnesium|platinum|plutonium)
+    exec i3
+    ;;
+  *)
+    exec ratpoison
+    ;;
+esac
 
-# Load .Xresources
-xrdb -merge ~/.Xresources &> /dev/null
 
 
-# Set caps lock as control to avoid emacs pinky
-setxkbmap -option ctrl:nocaps
-
-# Set java font option
-export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
-
-feh --bg-scale ~/Pictures/background.jpg&
-
-xset -b
-
-exec /usr/bin/ratpoison
+# vim: set expandtab tabstop=2 smarttab: