X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=xinitrc;h=a0f6e2a8aab0c1e9a4178eec6aa79fd7662032a0;hb=a8244e06cd9069e62f97755502a1fe8379427a93;hp=038a91443a966df376242581c901d1b898829efe;hpb=508381d5a4182627e89db0afd72c98c0ab8c3d55;p=max%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
index 038a914..a0f6e2a 100644
--- a/xinitrc
+++ b/xinitrc
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # ~/.xinitrc
 #
@@ -14,7 +14,8 @@ fi
 
 
 # Load .Xresources
-[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
+xrdb -merge ~/.Xresources &> /dev/null
+
 
 # Set caps lock as control to avoid emacs pinky
 setxkbmap -option ctrl:nocaps
@@ -22,13 +23,8 @@ setxkbmap -option ctrl:nocaps
 # Set java font option
 export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
 
-
 feh --bg-scale ~/Pictures/background.jpg&
 
+xset -b
 
-# exec gnome-session
-# exec startkde
-# exec startxfce4
-# ...or the Window Manager of your choice
-#exec i3
-exec ck-launch-session dbus-launch --sh-syntax --exit-with-session qtile 
+exec /usr/bin/ratpoison