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

diff --git a/X/.xinitrc b/X/.xinitrc
index d02fb1c..6a90d37 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -21,13 +21,13 @@ fi
 
 # Set keyboard layout
 case $HOSTNAME in
-    palladium|platinum|iridium)
+    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"
@@ -39,8 +39,8 @@ esac
 
 # Set screen layout
 case $HOSTNAME in
-  beryllium)
-    xrandr --output HDMI-1 --left-of DVI-I-1 
+  magnesium)
+    xrandr --output VGA1 --right-of HDMI2
     ;;
   *)
     ;;
@@ -55,20 +55,9 @@ 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)
+	platinum)
 		~/.local/bin/bat_mgt.sh&
 		;;
 	*)
@@ -77,11 +66,22 @@ esac
 
 cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc
 
+# 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
-  platinum)
-    exec ck-launch-session dbus-launch --sh-syntax --exit-with-session startkde
-    ;;
-  *)
-    exec /usr/bin/ratpoison
+        magnesium|platinum|plutonium)
+          exec i3
+          ;;
+        *)
+          exec ratpoison
+          ;;
 esac
-