diff options
| author | Xian Wang <dev@xianwang.io> | 2021-02-13 17:36:11 -0800 |
|---|---|---|
| committer | Xian Wang <dev@xianwang.io> | 2021-02-13 17:36:11 -0800 |
| commit | 768297bad768b82a1c88a27684ee7ad71dd4f4de (patch) | |
| tree | 2d9772f57f966fdfe78d19f57ba08a3ab37bfc86 | |
| parent | 4e7c7829e9ea9cba44108c3ea5dae5fe0d02b686 (diff) | |
| download | dotfiles-768297bad768b82a1c88a27684ee7ad71dd4f4de.tar.gz dotfiles-768297bad768b82a1c88a27684ee7ad71dd4f4de.tar.bz2 dotfiles-768297bad768b82a1c88a27684ee7ad71dd4f4de.zip | |
fix bug in gpgconf and zshrc
| -rw-r--r-- | gpg-agent.conf | 3 | ||||
| -rw-r--r-- | install.conf.yaml | 4 | ||||
| -rw-r--r-- | zshrc | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/gpg-agent.conf b/gpg-agent.conf index 40fb8ac..646d2d4 100644 --- a/gpg-agent.conf +++ b/gpg-agent.conf @@ -6,5 +6,6 @@ max-cache-ttl 120 #pinentry-program /usr/bin/pinentry-curses #pinentry-program /usr/bin/pinentry-tty #pinentry-program /usr/bin/pinentry-x11 -pinentry-program /usr/local/bin/pinentry-curses +#pinentry-program /usr/local/bin/pinentry-curses #pinentry-program /usr/local/bin/pinentry-mac +pinentry-program /usr/bin/pinentry diff --git a/install.conf.yaml b/install.conf.yaml index c0b53f0..95f8d4e 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -22,7 +22,9 @@ ~/.oh-my-zsh/custom/func.zsh: path: omz/custom/func.zsh create: true - ~/.gnupg/gpg-agent.conf: gpg-agent.conf + ~/.gnupg/gpg-agent.conf: + path: gpg-agent.conf + create: true - shell: - [git submodule update --init --recursive, Installing submodules] @@ -2,7 +2,7 @@ # export PATH=$HOME/bin:/usr/local/bin:$PATH # Path to your oh-my-zsh installation. -export ZSH="/Users/xianwang/.oh-my-zsh" +export ZSH="$HOME/.oh-my-zsh" # Set name of the theme to load --- if set to "random", it will # load a random theme each time oh-my-zsh is loaded, in which case, @@ -91,6 +91,9 @@ source $ZSH/oh-my-zsh.sh ZSH_COMPDUMP=~/.cache/.zcompdump +export PATH="$HOME/bin:$PATH" +export PATH="$HOME/.local/bin:$PATH" + export GPG_TTY="$(tty)" export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) gpgconf --kill gpg-agent |