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

diff --git a/X/.xinitrc b/X/.xinitrc
index 0546ebf..d12fed3 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -12,71 +12,9 @@ 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
-  platinum)
-    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)
-    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
-case $HOSTNAME in
-  magnesium)
-    xrandr --output VGA1 --right-of HDMI2
-    ;;
-  *)
-    ;;
-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
-
-# Battery monitoring
-case $HOSTNAME in
-  platinum)
-    ~/.local/bin/bat_mgt.sh&
-    ;;
-  *)
-    ;;
-esac
-
-cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc
-
-# run xcreensaver
-if [ -x $(which xscreensaver) ]; then
-  xscreensaver&
-fi
-
-# configure i3
-
-if [ -f ~/.config/i3/config.base ]; then
-  cat ~/.config/i3/config.base ~/.config/i3/config.${HOSTNAME} > ~/.config/i3/config
-fi
-
+# Source ~/.xprofile
+[ -f /etc/xprofile ] && . /etc/xprofile
+[ -f ~/.xprofile ] && . ~/.xprofile
 case $HOSTNAME in
   magnesium|platinum|plutonium)
     exec i3