Moved to gnome-keyring-daemon startup to bashrc

2 files changed, 8 insertions, 12 deletions

diff --git a/bash/.bash_profile b/bash/.bash_profile
deleted file mode 100644
index a4e4eb2..0000000
--- a/bash/.bash_profile
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# ~/.bash_profile
-#
-
-if [ -n "$DESKTOP_SESSION" ];then
-    eval $(gnome-keyring-daemon --start)
-    export SSH_AUTH_SOCK
-fi
-
-[[ -f ~/.bashrc ]] && . ~/.bashrc
-[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx
-
diff --git a/bash/.bashrc b/bash/.bashrc
index 247955a..2e6df21 100755
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -163,6 +163,14 @@ if exists pip; then
         }
 fi
 
+# Start gnome-keyring-daemon
+if exists gnome-keyring-daemon; then
+        if [ -n "$DESKTOP_SESSION" ];then
+                eval $(gnome-keyring-daemon --start)
+                export SSH_AUTH_SOCK
+        fi
+fi
+
 # Fancy bash prompt
 if exists liquidprompt; then
         source liquidprompt