X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=xinitrc;h=068856f171dffd7dfde36f6f9b6421c4af57eaae;hb=a5db382ceaaa972250509f4c1f1f8831cf8e09ed;hp=46c4191b79ae0e94ae1af5af464876c244751376;hpb=973187d9e6c2e9fecffdc5d2211710eb12bf7c4a;p=max%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
index 46c4191..068856f 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,12 +23,8 @@ setxkbmap -option ctrl:nocaps
 # Set java font option
 export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
 
+feh --bg-scale ~/Pictures/background.jpg&
 
+owncloud&
 
-
-# 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