X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=6a90d374788475d3b4cde9da783bda41ddb2cdcb;hb=9daf6459624ae71f23144822603cd581c0e57ea1;hp=60e56eb6bde8dd6e088ca61bb9e08f0f9281728a;hpb=d23bda261ed2f98974d5e9b1539d24e73bdd6a7a;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index 60e56eb..6a90d37 100644
--- 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)
+    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"
 	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
+    ;;
+  *)
+    ;;
 esac
 
 # Set java font option
@@ -54,12 +55,33 @@ 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
+	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