Remove old hostnames from conf files

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

diff --git a/X/.xinitrc b/X/.xinitrc
index d02fb1cbed639af1fa3dc80b60806988b2fb82eb..def251d4265ad66b3fcfcebe39c9791724739efa 100644 (file)
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -21,13 +21,13 @@ fi
 
 # Set keyboard layout
 case $HOSTNAME in
-    palladium|platinum|iridium)
+    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"
        ;;
-    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"
@@ -39,8 +39,8 @@ esac
 
 # Set screen layout
 case $HOSTNAME in
-  beryllium)
-    xrandr --output HDMI-1 --left-of DVI-I-1 
+  magnesium)
+    xrandr --output VGA1 --right-of HDMI2
     ;;
   *)
     ;;
@@ -65,10 +65,7 @@ xset -b
 
 # Battery monitoring
 case $HOSTNAME in
-       palladium)
-               xbattmon&
-               ;;
-       iridium|platinum)
+       platinum)
                ~/.local/bin/bat_mgt.sh&
                ;;
        *)
@@ -77,11 +74,22 @@ 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
+
 case $HOSTNAME in
-  platinum)
-    exec ck-launch-session dbus-launch --sh-syntax --exit-with-session startkde
-    ;;
-  *)
-    exec /usr/bin/ratpoison
+        magnesium|platinum|plutonium)
+          exec i3
+          ;;
+        *)
+          exec ratpoison
+          ;;
 esac
-