diff options
| author | EuAndreh <eu@euandre.org> | 2022-09-19 20:42:29 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2022-09-19 20:42:29 -0300 |
| commit | f5eab253f25f01626d1da7d97574080c598babde (patch) | |
| tree | c34ee859325e58d977ae15250ca08da723cec3fe | |
| parent | bin/email: Add UTF-8 content-type header (diff) | |
| download | dotfiles-f5eab253f25f01626d1da7d97574080c598babde.tar.gz dotfiles-f5eab253f25f01626d1da7d97574080c598babde.tar.xz | |
Move Git config out of Guix Home, and use a "include" for the smtp command path
| -rw-r--r-- | etc/git/config | 21 | ||||
| -rw-r--r-- | etc/guix/home.scm | 28 |
2 files changed, 26 insertions, 23 deletions
diff --git a/etc/git/config b/etc/git/config new file mode 100644 index 0000000..8b378a0 --- /dev/null +++ b/etc/git/config @@ -0,0 +1,21 @@ +[user] + email = eu@euandre.org + name = EuAndreh + signingkey = 81F90EC3CD356060 +[transfer] + fsckobjects = true +[push] + default = current +[commit] + gpgsign = true + verbose = true +[init] + defaultBranch = main +[sendemail] + assume8bitEncoding = UTF-8 + smtpserveroption = -a + smtpserveroption = euandreh + annotate = yes + confirm = never +[include] + path = config-extra diff --git a/etc/guix/home.scm b/etc/guix/home.scm index 626dd5e..0b61883 100644 --- a/etc/guix/home.scm +++ b/etc/guix/home.scm @@ -94,28 +94,10 @@ (define (xdg-config-home s) (string-append (getenv "XDG_CONFIG_HOME") "/" s)) -(define gitconfig - (mixed-text-file "gitconfig" #"- - [user] - email = eu@euandre.org - name = EuAndreh - signingkey = 81F90EC3CD356060 - [transfer] - fsckobjects = true - [push] - default = current - [commit] - gpgsign = true - verbose = true - [init] - defaultBranch = main - [sendemail] - assume8bitEncoding = UTF-8 - smtpserveroption = -a - smtpserveroption = euandreh - annotate = yes - confirm = never - smtpserver = "# msmtp-non-hardcoded "/bin/msmtpq\n")) +(define gitconfig-extra + (mixed-text-file + "gitconfig-extra" + "[sendemail]\n smtpserver = " msmtp-non-hardcoded "/bin/msmtpq\n")) (define gpg-agent.conf (mixed-text-file "gpg-agent.conf" #"- @@ -140,7 +122,7 @@ (define config-files `(("gnupg/gpg-agent.conf" ,gpg-agent.conf) - ("git/config" ,gitconfig) + ("git/config-extra" ,gitconfig-extra) ("ssh/config" ,ssh.conf))) (define dot-config |