xinitrc: herbstluftwm: don't log to custom log file

[config/dotfiles.git] / xinitrc

diff --git a/xinitrc b/xinitrc
index 0f3aa1e2eae0633f2c565f31166cf840db113760..a464b6ca2254519ca9cd8213e866274d6dec9754 100755 (executable)
--- a/xinitrc
+++ b/xinitrc
@@ -68,11 +68,9 @@ if test -f "$HOME/.xinitrc.local"; then
 fi
 
 
-# Start ssh-agent if no agent is running and we have private keys, thanks to
+# Start ssh-agent if no agent is running, thanks to
 # http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19).
-if test -z "$SSH_AGENT_PID" \
-        && test -x /usr/bin/ssh-agent \
-        && test -f "$HOME/.ssh/id_rsa"; then
+if test -z "$SSH_AGENT_PID" && test -x /usr/bin/ssh-agent; then
     # -s to force bourne shell output. This file is a bourne shell script even
     # if the environment might suggest otherwise.
     eval `/usr/bin/ssh-agent -s` >/dev/null
@@ -96,13 +94,13 @@ if xmodmap | grep -E '^lock.*Caps_Lock' >/dev/null; then
     xmodmap -e 'add Control = Control_L'
 fi
 # Move grave and tilde next to left shift key. This setting may only be
-# necessary because of my German keyboard which I use with English settings.
+# necessary because of my German keyboard which I use with an English layout.
 xmodmap -e 'keycode 94 = grave asciitilde'
 
 # Disable annoying audio bell. Thanks to Sebastian Rachuj.
 xset b off
 
-# Load settings for programs. Xdefaults is deprecated.
+# Load settings for X programs. Xdefaults is deprecated.
 xrdb "$HOME/.Xresources"
 
 # Change the background if available.
@@ -143,6 +141,7 @@ elif test -n "$screen_lock_force"; then
     error "'xautolock' not found. Auto lock won't work!"
 fi
 
+
 # Use compton to get transparent windows. See ~/.Xresources for configuration
 # of urxvt.
 if installed compton; then
@@ -160,7 +159,7 @@ fi
 # Start window manager.
 failed=
 if installed herbstluftwm; then
-    herbstluftwm --locked >"$HOME/.config/herbstluftwm/log" 2>&1 || failed=1
+    herbstluftwm --locked || failed=1
 elif installed xmonad; then
     xmonad || failed=1
 elif installed stumpwm; then