diff options
| author | Xian Wang <dev@xianwang.io> | 2021-05-03 11:36:35 -0400 |
|---|---|---|
| committer | Xian Wang <dev@xianwang.io> | 2021-05-03 11:36:35 -0400 |
| commit | 26d5ed380e1b6e5a5f61a34c463d75d75865000e (patch) | |
| tree | f81e0285613c21b6f3e35cdb0fee8a3195ca5ddc | |
| parent | b2852ed5059f65c850267f5ff6a7daaeda9c76ef (diff) | |
| download | dotfiles-26d5ed380e1b6e5a5f61a34c463d75d75865000e.tar.gz dotfiles-26d5ed380e1b6e5a5f61a34c463d75d75865000e.tar.bz2 dotfiles-26d5ed380e1b6e5a5f61a34c463d75d75865000e.zip | |
add fix and skip gpg-agent for servers
| -rw-r--r-- | install.conf.yaml | 4 | ||||
| -rw-r--r-- | zshrc | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/install.conf.yaml b/install.conf.yaml index 1531d8a..ca34495 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -8,8 +8,8 @@ - ~/.cache - ~/.config - create: - ~/.gnupg: - mode: 0700 + ~/.gnupg: + mode: 0700 - shell: - sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" @@ -68,7 +68,7 @@ ZSH_THEME="jnrowe" # Custom plugins may be added to $ZSH_CUSTOM/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(git) +plugins=(git pass) source $ZSH/oh-my-zsh.sh @@ -95,12 +95,14 @@ export PATH="$HOME/bin:$PATH" export PATH="$HOME/.local/bin:$PATH" export PATH="/usr/lib/distcc/bin:$PATH" -export GPG_TTY="$(tty)" -export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) -gpgconf --kill gpg-agent -gpgconf --launch gpg-agent -gpg-connect-agent updatestartuptty /bye > /dev/null -gpg-connect-agent "scd serialno" "learn --force" /bye > /dev/null +if [ ! -f $HOME/server ]; then + export GPG_TTY="$(tty)" + export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) + gpgconf --kill gpg-agent + gpgconf --launch gpg-agent + gpg-connect-agent updatestartuptty /bye > /dev/null + gpg-connect-agent "scd serialno" "learn --force" /bye > /dev/null +fi # Set personal aliases, overriding those provided by oh-my-zsh libs, # plugins, and themes. Aliases can be placed here, though oh-my-zsh |