summaryrefslogtreecommitdiff
path: root/base/bashrc
diff options
context:
space:
mode:
authorJesse Morgan <jesse@jesterpm.net>2018-04-12 16:00:46 -0700
committerJesse Morgan <jesse@jesterpm.net>2018-04-12 16:00:46 -0700
commitbea366fcdfa72910fde029205b677d28646e5dc4 (patch)
tree2372403ffb7f540b257d64ab3b91f2467a2d8f65 /base/bashrc
parent6674d294ff99b4f6439e6e7f7a8cde399d2bf507 (diff)
Misc. changes from new laptop
Diffstat (limited to 'base/bashrc')
-rw-r--r--base/bashrc14
1 files changed, 3 insertions, 11 deletions
diff --git a/base/bashrc b/base/bashrc
index 18ba4b2..d07906e 100644
--- a/base/bashrc
+++ b/base/bashrc
@@ -49,9 +49,6 @@ if [ -n "$force_color_prompt" ]; then
fi
fi
-if [ -f $(brew --prefix)/etc/bash_completion ]; then
- . $(brew --prefix)/etc/bash_completion
-fi
GIT_PS1_SHOWDIRTYSTATE=1
if [ "$color_prompt" = yes ]; then
@@ -111,15 +108,10 @@ fi
export EDITOR=vim
export MAILDIR=$HOME/.maildir/INBOX
-export SSH_AUTH_SOCK=$HOME/.gnupg/S.gpg-agent.ssh
-#if [ -f "${HOME}/.gpg-agent-info" ]; then
-# . "${HOME}/.gpg-agent-info"
-# export GPG_AGENT_INFO
-# export SSH_AUTH_SOCK
-# export SSH_AGENT_PID
-#fi
+#export SSH_AUTH_SOCK=$HOME/.gnupg/S.gpg-agent.ssh
+export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-source /usr/local/etc/bash_completion.d/*
+#source /usr/local/etc/bash_completion.d/*
if [ -f ~/.shell_pathes ]; then
source ~/.shell_pathes