X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=0546ebfcdc8327150247cc01e398c0390765899e;hb=cb2c165304f53d8e2e3cbc874d9ebfff9bc9cc6f;hp=2521a8889d8a03d308c3594994636913810480d9;hpb=f065367b1d2d3a73a0c7ee5b3d8fbc86e634fbf2;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index 2521a88..0546ebf 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -21,27 +21,24 @@ fi
 
 # Set keyboard layout
 case $HOSTNAME in
-    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"
-	;;
-    *)
-        ;;
+  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
     ;;
@@ -58,38 +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&
-		;;
-	*)
-                ;;
+  platinum)
+    ~/.local/bin/bat_mgt.sh&
+    ;;
+  *)
+    ;;
 esac
 
 cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc
 
 # run xcreensaver
 if [ -x $(which xscreensaver) ]; then
-	xscreensaver&
+  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)
-          exec i3
-          ;;
-        *)
-          exec ratpoison
-          ;;
+  magnesium|platinum|plutonium)
+    exec i3
+    ;;
+  *)
+    exec ratpoison
+    ;;
 esac
+
+
+
+# vim: set expandtab tabstop=2 smarttab: