summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Morgan <jesse@jesterpm.net>2017-12-18 12:52:04 -0800
committerJesse Morgan <jesse@jesterpm.net>2017-12-18 12:52:04 -0800
commit73eb11a2ae3a3935440e8e314a00e0d1c8c00a9c (patch)
tree2d620786c16ca566efad924eb5db6ce141c9ac6b
parent27be7296e2b33d3ffdd2f5d7c673f293fbc5c583 (diff)
Minor changes
-rw-r--r--base/bash_aliases2
-rw-r--r--base/bashrc13
2 files changed, 14 insertions, 1 deletions
diff --git a/base/bash_aliases b/base/bash_aliases
index 9cc0035..a5c77f3 100644
--- a/base/bash_aliases
+++ b/base/bash_aliases
@@ -1,2 +1,2 @@
-alias open=gnome-open
alias g="gvim --remote-silent"
+alias vi=vim
diff --git a/base/bashrc b/base/bashrc
index 3642bd7..18ba4b2 100644
--- a/base/bashrc
+++ b/base/bashrc
@@ -49,6 +49,9 @@ 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
@@ -108,6 +111,16 @@ 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
+
+source /usr/local/etc/bash_completion.d/*
+
if [ -f ~/.shell_pathes ]; then
source ~/.shell_pathes
fi