mac updatesHEADmaster

3 files changed, 11 insertions, 3 deletions

diff --git a/home/dot_local/share/private_gnupg/private_gpg-agent.conf b/home/dot_local/share/private_gnupg/private_gpg-agent.conf
deleted file mode 100644
index 4e3bb5d..0000000
--- a/home/dot_local/share/private_gnupg/private_gpg-agent.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-allow-preset-passphrase
-max-cache-ttl 604800
-pinentry-program /usr/bin/pinentry-gtk
diff --git a/home/dot_local/share/private_gnupg/private_gpg-agent.conf.tmpl b/home/dot_local/share/private_gnupg/private_gpg-agent.conf.tmpl
new file mode 100644
index 0000000..2e9d8d6
--- /dev/null
+++ b/home/dot_local/share/private_gnupg/private_gpg-agent.conf.tmpl
@@ -0,0 +1,7 @@
+allow-preset-passphrase
+max-cache-ttl 604800
+{{- if eq .chezmoi.os "darwin" }}
+pinentry-program {{ lookPath "pinentry-mac" }}
+{{- else if eq .chezmoi.os "linux" }}
+pinentry-program {{ lookPath "pinentry-gtk" }}
+{{- end }}
diff --git a/home/dot_zshrc b/home/dot_zshrc.tmpl
index 6220015..eca7ae1 100644
--- a/home/dot_zshrc
+++ b/home/dot_zshrc.tmpl
@@ -62,3 +62,7 @@ function cd() {
 	done
 }
 
+{{- if eq .chezmoi.os "darwin" }}
+
+eval "$(/opt/homebrew/bin/brew shellenv)"
+{{- end }}