Correct display names in i3 conf

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

diff --git a/X/.xinitrc b/X/.xinitrc
index 1b907ff54b6b7b8cad6c698955a61e908b8bb07f..0546ebfcdc8327150247cc01e398c0390765899e 100644 (file)
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -21,31 +21,26 @@ fi
 
 # Set keyboard layout
 case $HOSTNAME in
-  palladium)
+  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"
     ;;
-  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
 case $HOSTNAME in
-  beryllium)
-    xrandr --output HDMI-1 --left-of DVI-I-1 
+  magnesium)
+    xrandr --output VGA1 --right-of HDMI2
     ;;
   *)
     ;;
@@ -60,25 +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")
-#fi
-#
-#gpg-connect-agent updatestartuptty /bye >/dev/null
-
 # Battery monitoring
 case $HOSTNAME in
-  palladium)
-    xbattmon&
-    ;;
-  iridium)
+  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
+
+
+
+# vim: set expandtab tabstop=2 smarttab: