X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=d12fed36880d81edf04301556cc8b2a25d3e4bdc;hb=1b55d5d0506f5406dd473e85d3cf47e638af40f2;hp=d02fb1cbed639af1fa3dc80b60806988b2fb82eb;hpb=b6954184eabf300fe0a8538353d43ac475dfaab7;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index d02fb1c..d12fed3 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -12,76 +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|platinum|iridium)
-	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
-
-# Battery monitoring
-case $HOSTNAME in
-	palladium)
-		xbattmon&
-		;;
-	iridium|platinum)
-		~/.local/bin/bat_mgt.sh&
-		;;
-	*)
-                ;;
-esac
-
-cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc
-
-case $HOSTNAME in
-  platinum)
-    exec ck-launch-session dbus-launch --sh-syntax --exit-with-session startkde
-    ;;
-  *)
-    exec /usr/bin/ratpoison
-esac
 
+# vim: set expandtab tabstop=2 smarttab: