Remove xsession file.

It is ignored if .xinitrc is present.

diff --git a/xinitrc b/xinitrc
index 46c4191b79ae0e94ae1af5af464876c244751376..b936d6b4158888b2b8a54a8762df87b321563c41 100644 (file)
--- 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

diff --git a/xsession b/xsession
deleted file mode 100644 (file)
index a84af3b..0000000
--- a/xsession
+++ /dev/null
@@ -1,20 +0,0 @@
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-  for f in /etc/X11/xinit/xinitrc.d/*; do
-    [ -x "$f" ] && . "$f"
-  done
-  unset f
-fi
-
-
-# Load .Xresources
-[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
-
-# Set caps lock as control to avoid emacs pinky
-setxkbmap -option ctrl:nocaps
-
-# Set java font option
-export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
-
-feh --bg-scale ~/Pictures/background.jpg
-
-exec qtile