From 34a981ac1db3040cbc84f13547c63de0d87d074f Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 8 Oct 2022 11:48:07 -0300 Subject: etc/guix/home.scm: Stop generating "etc/ssh/config" file OpenSSH support ${ENVVAR} in its config, so there is no need to generated the file to get its value dynamically. --- etc/guix/home.scm | 15 +-------------- etc/ssh/config | 5 +++++ 2 files changed, 6 insertions(+), 14 deletions(-) create mode 100644 etc/ssh/config diff --git a/etc/guix/home.scm b/etc/guix/home.scm index 0b618838..6835efc9 100644 --- a/etc/guix/home.scm +++ b/etc/guix/home.scm @@ -108,22 +108,9 @@ enable-ssh-support pinentry-program "# pinentry-gtk2 "/bin/pinentry-gtk-2\n")) -(define ssh.conf - (plain-file "ssh.conf" - (string-replace-substring #"- - Host * - UserKnownHostsFile @XDG_CONFIG_HOME@/ssh/known_hosts - - Include ~/dev/libre/servers/src/infrastructure/ssh.conf - Include ~/dev/others/lawtech/src/infrastructure/ssh.conf - "# - "@XDG_CONFIG_HOME@" - (getenv "XDG_CONFIG_HOME")))) - (define config-files `(("gnupg/gpg-agent.conf" ,gpg-agent.conf) - ("git/config-extra" ,gitconfig-extra) - ("ssh/config" ,ssh.conf))) + ("git/config-extra" ,gitconfig-extra))) (define dot-config (let ((prefix-with-config diff --git a/etc/ssh/config b/etc/ssh/config new file mode 100644 index 00000000..8df05c09 --- /dev/null +++ b/etc/ssh/config @@ -0,0 +1,5 @@ +Host * + UserKnownHostsFile ${XDG_CONFIG_HOME}/ssh/known_hosts + +Include ~/dev/libre/servers/src/infrastructure/ssh.conf +Include ~/dev/others/lawtech/src/infrastructure/ssh.conf -- cgit v1.3