Update file config.tmpl
This commit is contained in:
parent
f44301fdcb
commit
8b52e6666e
1 changed files with 1 additions and 2 deletions
|
@ -128,7 +128,6 @@
|
||||||
diffFilter = delta --color-only
|
diffFilter = delta --color-only
|
||||||
[merge]
|
[merge]
|
||||||
conflictstyle = diff3
|
conflictstyle = diff3
|
||||||
ff = only
|
|
||||||
renamelimit = 0
|
renamelimit = 0
|
||||||
summary = true
|
summary = true
|
||||||
stat = true
|
stat = true
|
||||||
|
@ -155,7 +154,7 @@
|
||||||
smtpuser = {{ default "" .user.gmail.username }}
|
smtpuser = {{ default "" .user.gmail.username }}
|
||||||
smtpencryption = tls
|
smtpencryption = tls
|
||||||
smtpserverport = 587
|
smtpserverport = 587
|
||||||
smtpPass = {{ default "" (env "GMAIL_PASSWORD") }}
|
smtpPass = {{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "GMAIL_PASSWORD")) }}{{ includeTemplate "secrets/GMAIL_PASSWORD" | decrypt }}{{ else }}{{ default "" (env "GMAIL_PASSWORD") }}{{ end }}
|
||||||
[status]
|
[status]
|
||||||
showUntrackedFiles = all
|
showUntrackedFiles = all
|
||||||
submoduleSummary = true
|
submoduleSummary = true
|
||||||
|
|
Loading…
Reference in a new issue