From 55b7f539b3be44e1bf72855039e6f60faa3d191e Mon Sep 17 00:00:00 2001
From: Brian Zalewski <brian@megabyte.space>
Date: Wed, 30 Nov 2022 08:00:35 +0000
Subject: [PATCH] Update
 .local/share/chezmoi/home/private_dot_config/himalaya/config.toml,
 .local/share/chezmoi/home/.chezmoi.yaml.tmpl

---
 .local/share/chezmoi/home/.chezmoi.yaml.tmpl  |  5 +-
 .../private_dot_config/himalaya/config.toml   | 24 ++++++++
 .../himalaya/config.toml.tmpl.TODO            | 60 -------------------
 3 files changed, 27 insertions(+), 62 deletions(-)
 create mode 100644 .local/share/chezmoi/home/private_dot_config/himalaya/config.toml
 delete mode 100644 .local/share/chezmoi/home/private_dot_config/himalaya/config.toml.tmpl.TODO

diff --git a/.local/share/chezmoi/home/.chezmoi.yaml.tmpl b/.local/share/chezmoi/home/.chezmoi.yaml.tmpl
index b3a0bce9..8a438dd9 100644
--- a/.local/share/chezmoi/home/.chezmoi.yaml.tmpl
+++ b/.local/share/chezmoi/home/.chezmoi.yaml.tmpl
@@ -152,8 +152,9 @@ data:
     domain: "{{ $domain }}"
     gpg:
       id: "{{ $gpgKeyId }}"
-    gmailAddress: "{{ $gmailAddress }}"
-    gmailAddressAppPassword: "{{ $gmailAddressAppPassword }}"
+    gmail:
+      email: "{{ $gmailAddress }}"
+      password: "{{ $gmailAddressAppPassword }}"
     githubUsername: "{{ $githubUsername }}"
     locale: "{{ $locale }}"
     timezone: "{{ $timezone }}"
diff --git a/.local/share/chezmoi/home/private_dot_config/himalaya/config.toml b/.local/share/chezmoi/home/private_dot_config/himalaya/config.toml
new file mode 100644
index 00000000..89d501cb
--- /dev/null
+++ b/.local/share/chezmoi/home/private_dot_config/himalaya/config.toml
@@ -0,0 +1,24 @@
+display-name = "{{ .user.name }}"
+downloads-dir = "~/Downloads"
+signature = "Regards,\n\n{{ .user.name }}"
+email-listing-page-size = 50
+
+[gmail]
+default = true
+email = "{{ .user.gmail.email }}"
+
+backend = "imap"
+imap-host = "imap.gmail.com"
+imap-port = 993
+imap-login = "{{ .user.gmail.email }}"
+imap-passwd-cmd = "pass show gmail"
+
+sender = "smtp"
+smtp-host = "smtp.gmail.com"
+smtp-port = 465
+smtp-login = "{{ .user.gmail.email }}"
+smtp-passwd-cmd = "pass show gmail"
+
+[gmail.folder-aliases]
+sent = "[Gmail]/Sent Mail"
+drafts = "[Gmail]/Drafts"
diff --git a/.local/share/chezmoi/home/private_dot_config/himalaya/config.toml.tmpl.TODO b/.local/share/chezmoi/home/private_dot_config/himalaya/config.toml.tmpl.TODO
deleted file mode 100644
index c3674ed0..00000000
--- a/.local/share/chezmoi/home/private_dot_config/himalaya/config.toml.tmpl.TODO
+++ /dev/null
@@ -1,60 +0,0 @@
-display-name = "Paul DURANT"
-downloads-dir = "~/Downloads"
-signature = "Cordialement,\nPaul DURANT"
-email-listing-page-size = 50
-
-[gmail]
-default = true
-email = "p.durant@gmail.com"
-
-backend = "imap"
-imap-host = "imap.gmail.com"
-imap-port = 993
-imap-login = "p.durant@gmail.com"
-imap-passwd-cmd = "pass show gmail"
-
-sender = "smtp"
-smtp-host = "smtp.gmail.com"
-smtp-port = 465
-smtp-login = "p.durant@gmail.com"
-smtp-passwd-cmd = "pass show gmail"
-
-[gmail.folder-aliases]
-sent = "[Gmail]/Sent Mail"
-drafts = "[Gmail]/Drafts"
-
-[outlook]
-email = "pdurant@outlook.com"
-email-listing-page-size = 25
-signature = """
-Regards,
-Paul DURANT
-Sent from Outlook
-"""
-
-sender = "sendmail"
-sendmail-cmd = "/usr/bin/msmtp"
-
-backend = "imap"
-imap-host = "outlook.office365.com"
-imap-port = 993
-imap-login = "pdurant@outlook.com"
-imap-passwd-cmd = "security find-internet-password -gs outlook -w"
-
-[posteo-local]
-email = "paul.durant@localhost"
-display-name = "Paul D."
-downloads-dir = "~/Downloads/posteo"
-
-backend = "maildir"
-maildir-root-dir = "~/Maildir"
-
-sender = "smtp"
-smtp-host = "posteo.de"
-smtp-port = 465
-smtp-login = "paul.durant@posteo.com"
-smtp-passwd-cmd = "security find-internet-password -gs posteo -w"
-
-[posteo-local.mailboxes]
-sent = "Sent" # points to ~/Maildir/.Sent
-drafts = "~/Maildir/custom/drafts"