Merge branch 'master' of git.friedersdorff.com:max/dotfiles

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

diff --git a/X/.xinitrc b/X/.xinitrc
index a031825e5dcc5703b8da221fef55f1fa27537748..11f0213ffbadc54a7bf65af647771511585861a9 100644 (file)
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -21,12 +21,18 @@ fi
 
 # Set keyboard layout
 case $HOSTNAME in
-    palladium|beryllium)
+    palladium)
        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
 
@@ -44,6 +50,8 @@ export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
 
 feh --bg-scale ~/Pictures/background.jpg&
 
+/usr/lib64/xfce4/notifyd/xfce4-notifyd&
+
 xset -b
 
 exec /usr/bin/ratpoison