From e1665d2106b624295192de4631aeaac79dc36e25 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Mon, 18 Aug 2014 18:34:59 +0200
Subject: Fixed gnome-keyring startup

---
 i3wm/.i3/config | 1 +
 xorg/.xinitrc   | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/i3wm/.i3/config b/i3wm/.i3/config
index 173e699..44ed2c9 100644
--- a/i3wm/.i3/config
+++ b/i3wm/.i3/config
@@ -127,6 +127,7 @@ bindsym control+Mod1+l exec --no-startup-id i3lock -c 000000
 bindsym Control+Mod1+m exec --no-startup-id ~/.screenlayout/mobile.sh
 bindsym Control+Mod1+d exec --no-startup-id ~/.screenlayout/docked.sh
 
+exec --no-startup-id export $(gnome-keyring-daemon)
 exec --no-startup-id urxvtd
 exec --no-startup-id nm-applet
 exec --no-startup-id feh --bg-center ~/.background.jpg
diff --git a/xorg/.xinitrc b/xorg/.xinitrc
index b94f742..89eff01 100644
--- a/xorg/.xinitrc
+++ b/xorg/.xinitrc
@@ -7,11 +7,4 @@ xrdb -merge ~/.Xresources
 setxkbmap de
 xmodmap -e 'clear Lock' -e 'keycode 0x42 = Escape'
 
-source /etc/X11/xinit/xinitrc.d/30-dbus
-eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh)
-export SSH_AUTH_SOCK
-export GPG_AGENT_INFO
-export GNOME_KEYRING_CONTROL
-export GNOME_KEYRING_PID
-
 exec dbus-launch i3 
-- 
cgit v1.2.3