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

diff --git a/X/.xinitrc b/X/.xinitrc
index a031825..d02fb1c 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -16,27 +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|beryllium)
+    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)
+	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 --right-of HDMI1
-	;;
-    *)
-	;;
+  beryllium)
+    xrandr --output HDMI-1 --left-of DVI-I-1 
+    ;;
+  *)
+    ;;
 esac
 
 # Set java font option
@@ -44,6 +51,37 @@ export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
 
 feh --bg-scale ~/Pictures/background.jpg&
 
+/usr/lib64/xfce4/notifyd/xfce4-notifyd&
+
 xset -b
 
-exec /usr/bin/ratpoison
+#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
+
+case $HOSTNAME in
+  platinum)
+    exec ck-launch-session dbus-launch --sh-syntax --exit-with-session startkde
+    ;;
+  *)
+    exec /usr/bin/ratpoison
+esac
+