Move mailcap to it's own stow

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

diff --git a/X/.xinitrc b/X/.xinitrc
index 1b907ff54b6b7b8cad6c698955a61e908b8bb07f..9e44c741c379aa3ec9113b8e86e38da29e3a4e29 100644 (file)
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -21,25 +21,20 @@ 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"
-    ;;
-  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"
-    ;;
-  *)
+    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|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
@@ -47,6 +42,9 @@ case $HOSTNAME in
   beryllium)
     xrandr --output HDMI-1 --left-of DVI-I-1 
     ;;
+  magnesium)
+    xrandr --output VGA1 --right-of HDMI2
+    ;;
   *)
     ;;
 esac
@@ -70,15 +68,21 @@ xset -b
 
 # Battery monitoring
 case $HOSTNAME in
-  palladium)
-    xbattmon&
-    ;;
-  iridium)
-    ~/.local/bin/bat_mgt.sh&
-    ;;
-  *)
+       palladium)
+               xbattmon&
+               ;;
+       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