From 8ac8fa52003b6a1358b2e2d43b7d26081052f941 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Sat, 4 Apr 2020 21:52:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D1=81=20=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D0=B0=D0=BC=D0=B8=20(?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D0=B0=20=D0=B2=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D1=84?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=BB)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .zshrc                      |  3 +++
 agents.zsh                  | 23 +++++++++++++++++++++++
 keychain-config.zsh.example |  3 ---
 plugins.zsh                 |  4 ----
 4 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 agents.zsh
 delete mode 100644 keychain-config.zsh.example

diff --git a/.zshrc b/.zshrc
index 0370d8b..522805f 100644
--- a/.zshrc
+++ b/.zshrc
@@ -10,6 +10,9 @@ source $ZDOTDIR/options.zsh
 source $ZDOTDIR/plugins.zsh
 [ -e $ZDOTDIR/plugins.user.zsh ] && source $ZDOTDIR/plugins.user.zsh
 
+source $ZDOTDIR/agents.zsh
+[ -e $ZDOTDIR/agents.user.zsh ] && source $ZDOTDIR/agents.user.zsh
+
 source $ZDOTDIR/aliases.zsh
 [ -e $ZDOTDIR/aliases.user.zsh ] && source $ZDOTDIR/aliases.user.zsh
 
diff --git a/agents.zsh b/agents.zsh
new file mode 100644
index 0000000..cc6a7bd
--- /dev/null
+++ b/agents.zsh
@@ -0,0 +1,23 @@
+# Copy this file to agents.user.zsh and modify to your needs
+
+##
+# SSH agent
+##
+# zstyle :omz:plugins:ssh-agent agent-forwarding on
+# zstyle :omz:plugins:ssh-agent identities id_rsa
+# zstyle :omz:plugins:ssh-agent lifetime 10h
+# antibody bundle ohmyzsh/ohmyzsh path:plugins/ssh-agent
+
+##
+# GPG agent
+##
+# antibody bundle ohmyzsh/ohmyzsh path:plugins/gpg-agent
+
+##
+# Keychain
+##
+# zstyle :omz:plugins:keychain identities id_rsa 01234567
+# zstyle :omz:plugins:keychain options --quiet --inherit local-once --noask --nocolor --quick
+# zstyle :omz:plugins:keychain agents gpg,ssh
+# antibody bundle ohmyzsh/ohmyzsh path:plugins/keychain
+
diff --git a/keychain-config.zsh.example b/keychain-config.zsh.example
deleted file mode 100644
index 7180801..0000000
--- a/keychain-config.zsh.example
+++ /dev/null
@@ -1,3 +0,0 @@
-zstyle :omz:plugins:keychain agents gpg,ssh
-zstyle :omz:plugins:keychain identities id_rsa 01234567
-zstyle :omz:plugins:keychain options --quiet --inherit local-once --noask --nocolor --quick
diff --git a/plugins.zsh b/plugins.zsh
index 02ca62d..b8111db 100644
--- a/plugins.zsh
+++ b/plugins.zsh
@@ -20,7 +20,3 @@ antibody bundle ohmyzsh/ohmyzsh path:plugins/systemd
 antibody bundle ohmyzsh/ohmyzsh path:plugins/vim-interaction
 antibody bundle ohmyzsh/ohmyzsh path:plugins/web-search
 
-[ -e $ZDOTDIR/keychain-config.zsh ] && source $ZDOTDIR/keychain-config.zsh
-antibody bundle ohmyzsh/ohmyzsh path:plugins/gpg-agent
-antibody bundle ohmyzsh/ohmyzsh path:plugins/keychain
-