summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2009-02-07 18:05:25 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2009-02-07 18:05:25 +0100
commitbbc54ba89fb0021ef3ef8df61b00c5883734a465 (patch)
tree6e833630cde68ada32d9b55c7887d449354905af
parentd6930f3a315673107786b9002618dc483eb35014 (diff)
downloaddotfiles-bbc54ba89fb0021ef3ef8df61b00c5883734a465.tar.gz
dotfiles-bbc54ba89fb0021ef3ef8df61b00c5883734a465.tar.xz
dotfiles-bbc54ba89fb0021ef3ef8df61b00c5883734a465.zip
switch from keychain to gpg-agent
-rw-r--r--bashrc/main.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/bashrc/main.sh b/bashrc/main.sh
index 2fa0474..444d204 100644
--- a/bashrc/main.sh
+++ b/bashrc/main.sh
@@ -74,9 +74,6 @@ _load common locale
# now set a reasonable environment
_load common env
-# ssh/gpg-agent
-_load common keychain
-
# bash configuration
_load common shopt
@@ -87,6 +84,9 @@ _load node init
# command aliases
_load common alias
+# ssh agent forwarding
+_load common ssh-agent-forwarding
+
# pager options
_load common pager