Remove old hostnames from conf files

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

diff --git a/X/.xinitrc b/X/.xinitrc
index 1b907ff54b6b7b8cad6c698955a61e908b8bb07f..def251d4265ad66b3fcfcebe39c9791724739efa 100644 (file)
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -21,31 +21,26 @@ 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"
-    ;;
-  *)
+    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
-  beryllium)
-    xrandr --output HDMI-1 --left-of DVI-I-1 
+  magnesium)
+    xrandr --output VGA1 --right-of HDMI2
     ;;
   *)
     ;;
@@ -70,15 +65,31 @@ xset -b
 
 # Battery monitoring
 case $HOSTNAME in
-  palladium)
-    xbattmon&
-    ;;
-  iridium)
-    ~/.local/bin/bat_mgt.sh&
-    ;;
-  *)
+       platinum)
+               ~/.local/bin/bat_mgt.sh&
+               ;;
+       *)
+                ;;
 esac
 
 cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc
 
-exec /usr/bin/ratpoison
+# 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
+        magnesium|platinum|plutonium)
+          exec i3
+          ;;
+        *)
+          exec ratpoison
+          ;;
+esac