aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bash/.bash_profile12
-rwxr-xr-xbash/.bashrc8
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 @@
1#
2# ~/.bash_profile
3#
4
5if [ -n "$DESKTOP_SESSION" ];then
6 eval $(gnome-keyring-daemon --start)
7 export SSH_AUTH_SOCK
8fi
9
10[[ -f ~/.bashrc ]] && . ~/.bashrc
11[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx
12
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
163 } 163 }
164fi 164fi
165 165
166# Start gnome-keyring-daemon
167if exists gnome-keyring-daemon; then
168 if [ -n "$DESKTOP_SESSION" ];then
169 eval $(gnome-keyring-daemon --start)
170 export SSH_AUTH_SOCK
171 fi
172fi
173
166# Fancy bash prompt 174# Fancy bash prompt
167if exists liquidprompt; then 175if exists liquidprompt; then
168 source liquidprompt 176 source liquidprompt