diff options
| author | EuAndreh <eu@euandre.org> | 2022-10-29 17:02:07 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2022-10-29 17:02:07 -0300 |
| commit | 6894268bcfc024011091c8a177744657294275de (patch) | |
| tree | b80c273cf915bb38896cdceb7968807f54c75a86 | |
| parent | bin/mailcfg: Expand $XDG_LOG_HOME at file generation time (diff) | |
| download | dotfiles-6894268bcfc024011091c8a177744657294275de.tar.gz dotfiles-6894268bcfc024011091c8a177744657294275de.tar.xz | |
Generate etc/git/config-extra from Makefile instead of Guix Home
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | etc/guix/home.scm | 8 |
2 files changed, 6 insertions, 7 deletions
@@ -14,6 +14,7 @@ lisp-images = \ derived-assets = \ $(pod2man) \ $(XDG_CONFIG_HOME)/ssh/id_rsa.pub \ + $(XDG_CONFIG_HOME)/git/config-extra \ $(XDG_CONFIG_HOME)/alot/config \ $(XDG_CONFIG_HOME)/mbsync/config \ $(XDG_CONFIG_HOME)/msmtp/config \ @@ -56,6 +57,10 @@ $(XDG_CONFIG_HOME)/ssh/id_rsa.pub: gpg --export-ssh-key eu@euandre.org > $@ chmod 600 $@ +$(XDG_CONFIG_HOME)/git/config-extra: + printf '[sendemail]\n smtpserver = ' > $@ + command -v msmtpq >> $@ + $(XDG_DATA_HOME)/euandreh/e.list.txt: ~/Documents/txt/ opt/aux/gen-e-list.sh sh opt/aux/gen-e-list.sh > $@ diff --git a/etc/guix/home.scm b/etc/guix/home.scm index 0458c1f..05e9d86 100644 --- a/etc/guix/home.scm +++ b/etc/guix/home.scm @@ -172,11 +172,6 @@ (define (xdg-config-home s) (string-append (getenv "XDG_CONFIG_HOME") "/" s)) -(define gitconfig-extra - (mixed-text-file - "gitconfig-extra" - "[sendemail]\n smtpserver = " msmtp-non-hardcoded "/bin/msmtpq\n")) - ;; 2592000 = 60 * 60 * 24 * 30 (define gpg-agent.conf (mixed-text-file "gpg-agent.conf" #"- @@ -188,8 +183,7 @@ pinentry-program "# pinentry-gtk2 "/bin/pinentry-gtk-2\n")) (define config-files - `(("gnupg/gpg-agent.conf" ,gpg-agent.conf) - ("git/config-extra" ,gitconfig-extra))) + `(("gnupg/gpg-agent.conf" ,gpg-agent.conf))) (define dot-config (let ((prefix-with-config |