aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2014-08-18 18:34:59 +0200
committerAdrian Kummerlaender2014-08-18 18:34:59 +0200
commite1665d2106b624295192de4631aeaac79dc36e25 (patch)
tree293ae74842b81470a9d60e3bbce05d90098613b1
parentbb2a89b98636a19ef36f193f74eab94bdac5540e (diff)
downloaddotfiles-e1665d2106b624295192de4631aeaac79dc36e25.tar
dotfiles-e1665d2106b624295192de4631aeaac79dc36e25.tar.gz
dotfiles-e1665d2106b624295192de4631aeaac79dc36e25.tar.bz2
dotfiles-e1665d2106b624295192de4631aeaac79dc36e25.tar.lz
dotfiles-e1665d2106b624295192de4631aeaac79dc36e25.tar.xz
dotfiles-e1665d2106b624295192de4631aeaac79dc36e25.tar.zst
dotfiles-e1665d2106b624295192de4631aeaac79dc36e25.zip
Fixed gnome-keyring startup
-rw-r--r--i3wm/.i3/config1
-rw-r--r--xorg/.xinitrc7
2 files changed, 1 insertions, 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