X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=d12fed36880d81edf04301556cc8b2a25d3e4bdc;hb=24e7901d11929fc6e13b3579fbc74398ce8d4ebf;hp=60e56eb6bde8dd6e088ca61bb9e08f0f9281728a;hpb=d23bda261ed2f98974d5e9b1539d24e73bdd6a7a;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index 60e56eb..d12fed3 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -12,54 +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
-case $HOSTNAME in
-    palladium)
-	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"
-	;;
-    beryllium)
-	setxkbmap -variant colemak us
-	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"
-	;;
-    *)
-esac
-
-# Set screen layout
+# Source ~/.xprofile
+[ -f /etc/xprofile ] && . /etc/xprofile
+[ -f ~/.xprofile ] && . ~/.xprofile
 case $HOSTNAME in
-    beryllium)
-	xrandr --output HDMI-1 --left-of DVI-I-1 
-	;;
-    *)
-	;;
+  magnesium|platinum|plutonium)
+    exec i3
+    ;;
+  *)
+    exec ratpoison
+    ;;
 esac
 
-# Set java font option
-export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
-
-feh --bg-scale ~/Pictures/background.jpg&
-
-/usr/lib64/xfce4/notifyd/xfce4-notifyd&
 
-xset -b
-
-#if ! pgrep -x -u "${USER}" gpg-agent>/dev/null 2>&1; then
-#    eval $(gpg-agent --daemon \
-#		     --use-standard-socket \
-#		     --write-env-file "${HOME}/.gpg-agent-info")
-#fi
-#
-#gpg-connect-agent updatestartuptty /bye >/dev/null
 
-exec /usr/bin/ratpoison
+# vim: set expandtab tabstop=2 smarttab: