Move mailcap to it's own stow

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

diff --git a/X/.xinitrc b/X/.xinitrc
index 3c02be34e765b6368edb5293dab4e934973f513b..9e44c741c379aa3ec9113b8e86e38da29e3a4e29 100644 (file)
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -16,39 +16,37 @@ fi
 # Load .Xresources
 xrdb -merge ~/.Xresources &> /dev/null
 if [ -f ~/.Xresources.$HOSTNAME ]; then
-    xrdb -merge ~/.Xresources.$HOSTNAME &> /dev/null
+  xrdb -merge ~/.Xresources.$HOSTNAME &> /dev/null
 fi
 
 # Set keyboard layout
 case $HOSTNAME in
-    palladium)
+    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"
        ;;
-    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)
+    beryllium|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
-    beryllium)
-       xrandr --output HDMI-1 --left-of DVI-I-1 
-       ;;
-    *)
-       ;;
+  beryllium)
+    xrandr --output HDMI-1 --left-of DVI-I-1 
+    ;;
+  magnesium)
+    xrandr --output VGA1 --right-of HDMI2
+    ;;
+  *)
+    ;;
 esac
 
 # Set java font option
@@ -62,8 +60,8 @@ 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")
+  #                 --use-standard-socket \
+  #                 --write-env-file "${HOME}/.gpg-agent-info")
 #fi
 #
 #gpg-connect-agent updatestartuptty /bye >/dev/null
@@ -73,12 +71,18 @@ case $HOSTNAME in
        palladium)
                xbattmon&
                ;;
-       iridium)
+       iridium|platinum)
                ~/.local/bin/bat_mgt.sh&
                ;;
        *)
+                ;;
 esac
 
 cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc
 
+# run xcreensaver
+if [ -x $(which xscreensaver) ]; then
+       xscreensaver&
+fi
+
 exec /usr/bin/ratpoison