From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Tue, 10 Nov 2015 13:40:12 +0000 (+0000)
Subject: Remove xsession file.
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=f2969ecee9ef886ef622369042d671b30b1c6eea;p=max%2Fdotfiles.git

Remove xsession file.

It is ignored if .xinitrc is present.
---

diff --git a/xinitrc b/xinitrc
index 46c4191..b936d6b 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
diff --git a/xsession b/xsession
deleted file mode 100644
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