Correctly set SSH_AGENT_SOCKET

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

diff --git a/X/.xinitrc b/X/.xinitrc
index cc26e4ec457a3d3953ee5218b5c974a0a53dd2c7..d12fed36880d81edf04301556cc8b2a25d3e4bdc 100644 (file)
--- 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 VGA1 --left-of HDMI1
-       ;;
-    *)
-       ;;
+  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: