Correct display names in i3 conf

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

diff --git a/X/.xinitrc b/X/.xinitrc
index 8aba85f39b10fad818e53cbfd42e954eb951c7f0..0546ebfcdc8327150247cc01e398c0390765899e 100644 (file)
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -16,33 +16,34 @@ 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)
-       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 VGA1 --left-of HDMI1
-       ;;
-    *)
-       ;;
+  magnesium)
+    xrandr --output VGA1 --right-of HDMI2
+    ;;
+  *)
+    ;;
 esac
 
 # Set java font option
@@ -54,12 +55,37 @@ feh --bg-scale ~/Pictures/background.jpg&
 
 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")
+# Battery monitoring
+case $HOSTNAME in
+  platinum)
+    ~/.local/bin/bat_mgt.sh&
+    ;;
+  *)
+    ;;
+esac
+
+cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc
+
+# run xcreensaver
+if [ -x $(which xscreensaver) ]; then
+  xscreensaver&
 fi
 
-gpg-connect-agent udatestartuptty /bye >/dev/null
+# 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
+
+
 
-exec /usr/bin/ratpoison
+# vim: set expandtab tabstop=2 smarttab: