From 29480b6e86ca6057d4151accdb5d4103f1657596 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 4 Mar 2023 19:23:36 +0100 Subject: ... --- system-profiles/initrd-ssh/module.nix | 10 +++++----- system-profiles/openssh/default.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'system-profiles') diff --git a/system-profiles/initrd-ssh/module.nix b/system-profiles/initrd-ssh/module.nix index 9ea469b2..18a50cbf 100644 --- a/system-profiles/initrd-ssh/module.nix +++ b/system-profiles/initrd-ssh/module.nix @@ -122,13 +122,13 @@ in HostKey ${initrdKeyPath path} '')} - KexAlgorithms ${concatStringsSep "," sshdCfg.kexAlgorithms} - Ciphers ${concatStringsSep "," sshdCfg.ciphers} - MACs ${concatStringsSep "," sshdCfg.macs} + KexAlgorithms ${concatStringsSep "," sshdCfg.settings.KexAlgorithms} + Ciphers ${concatStringsSep "," sshdCfg.settings.Ciphers} + MACs ${concatStringsSep "," sshdCfg.settings.Macs} - LogLevel ${sshdCfg.logLevel} + LogLevel ${sshdCfg.settings.LogLevel} - ${if sshdCfg.useDns then '' + ${if sshdCfg.settings.UseDns then '' UseDNS yes '' else '' UseDNS no diff --git a/system-profiles/openssh/default.nix b/system-profiles/openssh/default.nix index a047a21d..cc4ecdf0 100644 --- a/system-profiles/openssh/default.nix +++ b/system-profiles/openssh/default.nix @@ -11,7 +11,7 @@ in { default = true; }; }; - + config = { systemd.user.services."ssh-agent".enable = mkForce false; # ssh-agent should be done via home-manager -- cgit v1.2.3