X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=d12fed36880d81edf04301556cc8b2a25d3e4bdc;hb=780545c9f59b56a59aba353193d9e63ac6f85109;hp=a031825e5dcc5703b8da221fef55f1fa27537748;hpb=8f540bfb294f5fadf9e15d85c668c8dda3ced64c;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index a031825..d12fed3 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -12,38 +12,18 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
   unset f
 fi
 
-
-# Load .Xresources
-xrdb -merge ~/.Xresources &> /dev/null
-if [ -f ~/.Xresources.$HOSTNAME ]; then
-    xrdb -merge ~/.Xresources.$HOSTNAME &> /dev/null
-fi
-
-# Set keyboard layout
+# Source ~/.xprofile
+[ -f /etc/xprofile ] && . /etc/xprofile
+[ -f ~/.xprofile ] && . ~/.xprofile
 case $HOSTNAME in
-    palladium|beryllium)
-	setxkbmap -variant colemak gb
-	xmodmap -e "keycode 66 = Control_L Control_L Control_L Control_L"
-	xmodmap -e "keycode 135 = Control_R Control_R Control_R Control_R"
-	xmodmap -e "add Control = Control_L Control_R"
-	;;
-    *)
+  magnesium|platinum|plutonium)
+    exec i3
+    ;;
+  *)
+    exec ratpoison
+    ;;
 esac
 
-# Set screen layout
-case $HOSTNAME in
-    beryllium)
-	xrandr --output VGA1 --right-of HDMI1
-	;;
-    *)
-	;;
-esac
-
-# 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: